Skip to content

Commit d449c06

Browse files
committed
Merge remote-tracking branch 'origin/gh-pages' into i18n
* origin/gh-pages: Ignore new repo name for now Update repo name Update description Fix page title
2 parents e8a172c + a4a488f commit d449c06

File tree

10 files changed

+22
-15
lines changed

10 files changed

+22
-15
lines changed

CONTRIBUTING.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ We've put together the following guidelines to help you figure out where you can
1919
0. [Community](#community)
2020

2121
## Types of contributions we're looking for
22-
First and foremost, this project is a forum to discuss open source best practices, then document them in a guide when we've found consensus. Your first contribution might be starting a new conversation, or adding to an existing conversation, around best practices. You can do so under [Issues](https://github.com/github/open-source-guide/issues).
22+
First and foremost, this project is a forum to discuss open source best practices, then document them in a guide when we've found consensus. Your first contribution might be starting a new conversation, or adding to an existing conversation, around best practices. You can do so under [Issues](https://github.com/github/opensource.guide/issues).
2323

2424
There are also many ways you can directly contribute to the guides (in descending order of need):
2525

@@ -42,7 +42,7 @@ Before we get started, here are a few things we expect from you (and that you sh
4242

4343
## How to contribute
4444

45-
If you'd like to contribute, start by searching through the [issues](https://github.com/github/open-source-guide/issues) and [pull requests](https://github.com/github/open-source-guide/pulls) to see whether someone else has raised a similar idea or question.
45+
If you'd like to contribute, start by searching through the [issues](https://github.com/github/opensource.guide/issues) and [pull requests](https://github.com/github/opensource.guide/pulls) to see whether someone else has raised a similar idea or question.
4646

4747
If you don't see your idea listed, and you think it fits into the goals of this guide, do one of the following:
4848
* **If your contribution is minor,** such as a typo fix, open a pull request.
@@ -68,6 +68,6 @@ This repo is currently maintained by @nayafia and @bkeepers, who have commit acc
6868

6969
## Community
7070

71-
Discussions about the Open Source Guides take place on this repository's [Issues](https://github.com/github/open-source-guide/issues) and [Pull Requests](https://github.com/github/open-source-guide/pulls) sections. Anybody is welcome to join these conversations. There is also a [mailing list](http://eepurl.com/cecpnT) for regular updates.
71+
Discussions about the Open Source Guides take place on this repository's [Issues](https://github.com/github/opensource.guide/issues) and [Pull Requests](https://github.com/github/opensource.guide/pulls) sections. Anybody is welcome to join these conversations. There is also a [mailing list](http://eepurl.com/cecpnT) for regular updates.
7272

7373
Wherever possible, do not take these conversations to private channels, including contacting the maintainers directly. Keeping communication public means everybody can benefit and learn from the conversation.

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Open Source Guides
22

3-
[![Build Status](https://travis-ci.org/github/open-source-guide.svg?branch=gh-pages)](https://travis-ci.org/github/open-source-guide)
3+
[![Build Status](https://travis-ci.org/github/opensource.guide.svg?branch=gh-pages)](https://travis-ci.org/github/opensource.guide)
44

55
Open Source Guides (https://opensource.guide/) are a collection of resources for individuals, communities, and companies who want to learn how to run and contribute to an open source project.
66

_config.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
title: Open Source Guides
2-
description: A community guide for open source creators.
1+
title: "Open Source Guides"
2+
description: "Learn how to launch and grow your project."
33

44
# See: docs/translations.md
55
locale: en-US
@@ -58,7 +58,7 @@ sass:
5858
branch: gh-pages
5959

6060
github:
61-
repository_nwo: github/open-source-guide
61+
repository_nwo: github/opensource.guide
6262

6363
twitter:
6464
username: github

_data/locale/en-US.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,10 @@ footer:
1919
button: Subscribe
2020
byline:
2121
# [code], [love], and [github] will be replaced by octicons
22-
format: "[code] with [love] by [github]"
22+
format: "[code] with [love] by [github] and [friends]"
2323
# Label for code octicon
2424
code_label: code
2525
# Label for love octicon
2626
love_label: love
27+
# Label for the contributors link
28+
friends_label: friends

_includes/footer.html

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,13 @@ <h3 class="alt-h3 mb-3">{{ site.data.locale[site.locale].footer.subscribe.headin
5454
{% capture github %}
5555
<svg height="20" class="octicon octicon-mark-github v-align-middle fill-gray mx-1" aria-label="GitHub" viewBox="0 0 16 16" version="1.1" width="20" role="img"><path d="M8 0C3.58 0 0 3.58 0 8c0 3.54 2.29 6.53 5.47 7.59.4.07.55-.17.55-.38 0-.19-.01-.82-.01-1.49-2.01.37-2.53-.49-2.69-.94-.09-.23-.48-.94-.82-1.13-.28-.15-.68-.52-.01-.53.63-.01 1.08.58 1.23.82.72 1.21 1.87.87 2.33.66.07-.52.28-.87.51-1.07-1.78-.2-3.64-.89-3.64-3.95 0-.87.31-1.59.82-2.15-.08-.2-.36-1.02.08-2.12 0 0 .67-.21 2.2.82.64-.18 1.32-.27 2-.27.68 0 1.36.09 2 .27 1.53-1.04 2.2-.82 2.2-.82.44 1.1.16 1.92.08 2.12.51.56.82 1.27.82 2.15 0 3.07-1.87 3.75-3.65 3.95.29.25.54.73.54 1.48 0 1.07-.01 1.93-.01 2.2 0 .21.15.46.55.38A8.013 8.013 0 0 0 16 8c0-4.42-3.58-8-8-8z"></path></svg>
5656
{% endcapture %}
57+
{% capture friends %}
58+
{% assign friends_label = site.data.locale[site.locale].footer.byline.friends_label %}
59+
<a href="https://github.com/github/opensource.guide/graphs/contributors" class="text-gray">{{ friends_label }}</a>
60+
{% endcapture %}
5761

5862
{% assign byline = site.data.locale[site.locale].footer.byline.format %}
59-
{{ byline | replace: "[code]", code | replace: "[love]", love | replace: "[github]", github }}
63+
{{ byline | replace: "[code]", code | replace: "[love]", love | replace: "[github]", github | replace: "[friends]", friends }}
6064
</div>
6165

6266
<div class="text-small my-6">

_includes/nav.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
<div class="float-sm-right">
44
<ul class="main-links d-flex flex-wrap flex-items-stretch border-left border-bottom border-sm-0 list-style-none">
55
<li class="d-inline-block border-right">
6-
<a class="d-block p-3 p-sm-4" href="https://github.com/github/open-source-guide#open-source-guides">
6+
<a class="d-block p-3 p-sm-4" href="https://github.com/github/opensource.guide#readme">
77
{{ site.data.locale[site.locale].nav.about }}
88
</a>
99
</li>
1010
<li class="d-inline-block border-right">
11-
<a class="d-block p-3 p-sm-4" href="https://github.com/github/open-source-guide/blob/gh-pages/CONTRIBUTING.md">
11+
<a class="d-block p-3 p-sm-4" href="https://github.com/github/opensource.guide/blob/gh-pages/CONTRIBUTING.md">
1212
{{ site.data.locale[site.locale].nav.contribute }}
1313
</a>
1414
</li>

docs/templates/translation-issue-template.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,4 @@ On the `gh-pages` branch of your fork:
2323

2424
Once a translation is completed:
2525

26-
- [ ] Open a Pull Request on the [upstream repository](https://github.com/github/open-source-guide) to add your fork to `translations` in `_config.yml`
26+
- [ ] Open a Pull Request on the [upstream repository](https://github.com/github/opensource.guide) to add your fork to `translations` in `_config.yml`

docs/translations.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ TODO
44

55
## Starting a translation
66

7-
Thanks for your interest in translating the guides! Before you start working on a translation, look through the [open translation issues](https://github.com/github/open-source-guide/labels/translation) to see if anyone else is already working on one for your language.
7+
Thanks for your interest in translating the guides! Before you start working on a translation, look through the [open translation issues](https://github.com/github/opensource.guide/labels/translation) to see if anyone else is already working on one for your language.
88

99
If there's not, then today is your day to lead this effort! Here's how to start:
1010

11-
0. [Fork this repository](https://github.com/github/open-source-guide/fork)
11+
0. [Fork this repository](https://github.com/github/opensource.guide/fork)
1212
0. Open an issue using [this issue template](templates/translation-issue-template.md)
1313
0. Start working through the checklist!
1414

notices.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Running an open source project, like any human endeavor, involves uncertainty an
1515

1616
Content is copyright © Open Source Guides authors, released under [CC-BY-4.0](https://creativecommons.org/licenses/by/4.0/), which gives you permission to use content for almost any purpose (but does not grant you any trademark permissions), so long as you note the license and give credit, such as follows:
1717

18-
> Content based on [github.com/github/open-source-guide](https://github.com/github/open-source-guide) used under the [CC-BY-4.0](https://creativecommons.org/licenses/by/4.0/) license.
18+
> Content based on [github.com/github/opensource.guide](https://github.com/github/opensource.guide) used under the [CC-BY-4.0](https://creativecommons.org/licenses/by/4.0/) license.
1919
2020
Code, including source files and code samples if any in the content, is released under [CC0-1.0](https://creativecommons.org/publicdomain/zero/1.0/), with the following exceptions:
2121

script/html-proofer

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ require "bundler/setup"
44
require "html-proofer"
55

66
url_ignores = [
7+
%r{^https://github.com/github/opensource.guide},
78
'https://karissa.github.io/post/okf-de',
89
'https://this-week-in-rust.org/',
910
'https://www.vagrantup.com/'

0 commit comments

Comments
 (0)