Skip to content

Update license and attribution#725

Merged
jpyuda merged 33 commits into
18f-pages-stagingfrom
update-license
Sep 25, 2015
Merged

Update license and attribution#725
jpyuda merged 33 commits into
18f-pages-stagingfrom
update-license

Conversation

@maya

@maya maya commented Sep 25, 2015

Copy link
Copy Markdown
Contributor

This updates our license content in the README.md, LICENSE.md, and CONTRIBUTING.md to add info for Bourbon, Neat and Font Awesome icons.

BIG thanks to @brittag for helping out on this one! ⭐ 🎆

@maya maya added this to the Launch milestone Sep 25, 2015
@maya

maya commented Sep 25, 2015

Copy link
Copy Markdown
Contributor Author

@mollieru can we update the intro paragraph to closer match what we went with on the homepage? There's some discrepancy between the 508 highest standards language that we went with on the site.

maya and others added 5 commits September 24, 2015 18:52
Updated intro paragrph to more closely match the modified homepage language.
@mollieru

Copy link
Copy Markdown
Contributor

@maya fixed the intro paragraph to reflect language we're now using on the homepage. thx!

Comment thread CONTRIBUTING.md Outdated

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it follow or follows?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changed to follow in 4762fd1 after chatting with @awfrancisco

Comment thread LICENSE.md

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Our style would put a comma after distribute, but if this is official legal language it's fine to leave it.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes in it official language. Will leave as is.

Comment thread README.md Outdated

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Source Sans Pro and Merriweather are also released on SIL Open Font License. @maya @jpyuda do we also need to list those here? (See language here on font licenses: https://github.com/18F/web-design-standards-assets/pull/9/files)

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's ask @brittag

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

per @jpyuda 's guidance, just added font license language

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mollieru the license needs to go in LICENSE as well, just like the others.

@mollieru

Copy link
Copy Markdown
Contributor

@maya I don't have experience w this -- can you ping someone to help pull the right part of the license text?

jpyuda pushed a commit that referenced this pull request Sep 25, 2015
Update license and attribution
@jpyuda jpyuda merged commit 6c1338d into 18f-pages-staging Sep 25, 2015
@maya maya deleted the update-license branch September 25, 2015 19:35
@maya maya mentioned this pull request Sep 25, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants