Skip to content

Commit

Permalink
Merge branch 'master' into dev2019
Browse files Browse the repository at this point in the history
  • Loading branch information
TimidRobot committed Dec 6, 2019
2 parents 80bbffc + e85e211 commit 1384d39
Showing 1 changed file with 12 additions and 13 deletions.
25 changes: 12 additions & 13 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@ help and support
This repostory is currently for:
1. Public help and support [Issues][issues]
2. Legalcode and translations
3. Styles and other Includes
4. Instllation of the website
3. Installation of the website (including Styles and other Includes)

[issues]: https://github.com/creativecommons/creativecommons.org/issues

Expand Down Expand Up @@ -49,12 +48,12 @@ Relevant directories:
- [`tools`](tools/): tools to assist with managing the translations

Also see:
- [Legal Code Translation Policy - CC Public Wiki][wiki-legal-code]: Documents
- [Legal Code Translation Policy - CC Public Wiki][translatepolicy]: Documents
Legal/Translation process and policy
- [Legal Tools Translation - Creative Commons][fourstatus]: Translation status
- [Legal Tools Translation - CC Public Wiki][fourstatus]: Translation status
for 4.0 and CC0 licenses

[wiki-legal-code]: https://wiki.creativecommons.org/wiki/Legal_Code_Translation_Policy
[translatepolicy]: https://wiki.creativecommons.org/wiki/Legal_Code_Translation_Policy
[fourstatus]: https://wiki.creativecommons.org/wiki/Legal_Tools_Translation


Expand Down Expand Up @@ -118,14 +117,6 @@ CC0 1.0 | [Source File][cc-zero-source] | [Legal Code][cc-zero-legalcode] | [Dee
[cc-zero-rdf]: https://creativecommons.org/publicdomain/zero/1.0/rdf


## Styles and other Includes

:warning: **WARNING:** Any change to style or other includes must be duplicated
within the [creativecommons/new-creativecommons.org][neworg] respository.

[neworg]: https://github.com/creativecommons/new-creativecommons.org


## Installation

:warning: **WARNING:** Use of the bootstrap scripts in the master branch is NOT
Expand Down Expand Up @@ -158,6 +149,14 @@ In addition to this one, the following child repositories are also used:
[rdfadict]: https://github.com/creativecommons/rdfadict


### Styles and other Includes

:warning: **WARNING:** Any change to style or other includes must be duplicated
within the [creativecommons/new-creativecommons.org][neworg] respository.

[neworg]: https://github.com/creativecommons/new-creativecommons.org


## License

- [`LICENSE`](LICENSE) (Expat/[MIT][mit] License)
Expand Down

0 comments on commit 1384d39

Please sign in to comment.