Skip to content

Commit 26b1a67

Browse files
committed
Merge pull request GSA#12 from GSA/licensing
Remove duplicate licensing files
2 parents 9c0bc0a + 903336f commit 26b1a67

6 files changed

Lines changed: 43 additions & 345 deletions

File tree

CONTRIBUTING.md

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,9 @@
1-
If you'd like to contribute to this project, please use the fork-and-pull
2-
model:
1+
## Public domain
32

4-
1. Fork this repository to your personal account.
5-
2. Create a branch and make your changes.
6-
3. Test the changes locally/in your personal fork.
7-
4. Submit a pull request to open a discussion about your proposed changes.
8-
5. We'll talk about it and decide to merge or request additional changes.
9-
10-
---
11-
12-
The project is in the public domain within the United States, and
3+
This project is in the public domain within the United States, and
134
copyright and related rights in the work worldwide are waived through
14-
the [CC0 1.0 Universal public domain dedication][CC0].
5+
the [CC0 1.0 Universal public domain dedication](https://creativecommons.org/publicdomain/zero/1.0/).
156

167
All contributions to this project will be released under the CC0
178
dedication. By submitting a pull request, you are agreeing to comply
189
with this waiver of copyright interest.
19-
20-
[CC0]: http://creativecommons.org/publicdomain/zero/1.0/

COPYING.txt

Lines changed: 0 additions & 121 deletions
This file was deleted.

LICENSE

Lines changed: 0 additions & 116 deletions
This file was deleted.

LICENSE.md

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
As a work of the United States Government, this project is in the
2+
public domain within the United States.
3+
4+
Additionally, we waive copyright and related rights in the work
5+
worldwide through the CC0 1.0 Universal public domain dedication.
6+
7+
## CC0 1.0 Universal Summary
8+
9+
This is a human-readable summary of the
10+
[Legal Code (read the full text)](https://creativecommons.org/publicdomain/zero/1.0/legalcode).
11+
12+
### No Copyright
13+
14+
The person who associated a work with this deed has dedicated the work to
15+
the public domain by waiving all of his or her rights to the work worldwide
16+
under copyright law, including all related and neighboring rights, to the
17+
extent allowed by law.
18+
19+
You can copy, modify, distribute and perform the work, even for commercial
20+
purposes, all without asking permission.
21+
22+
### Other Information
23+
24+
In no way are the patent or trademark rights of any person affected by CC0,
25+
nor are the rights that other persons may have in the work or in how the
26+
work is used, such as publicity or privacy rights.
27+
28+
Unless expressly stated otherwise, the person who associated a work with
29+
this deed makes no warranties about the work, and disclaims liability for
30+
all uses of the work, to the fullest extent permitted by applicable law.
31+
When using or citing the work, you should not imply endorsement by the
32+
author or the affirmer.

README.md

Lines changed: 8 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,14 @@
1-
# DOCter
1+
## HTTPS for the federal government
22

3-
DOCter is a [Jekyll](http://jekyllrb.com/) template for quickly building out project pages and documentation.
3+
This is a collection of resources, best practices, and case studies for HTTPS in the federal government.
44

5-
![DOCter Screenshot](https://github.com/ascott1/DOCter/blob/gh-pages/assets/img/screenshot.png?raw=true)
5+
Maintained by people from the [U.S. Digital Service](http://wh.gov/usds) and [18F](https://18f.gsa.gov). Please join us and help out!
66

7-
[See the demo](http://cfpb.github.io/DOCter/)
87

9-
## To run DOCter locally
8+
### Public domain
109

11-
Be sure to have Jekyll and Kramdown installed.
10+
This project is in the worldwide [public domain](LICENSE.md). As stated in [CONTRIBUTING](CONTRIBUTING.md):
1211

13-
```
14-
gem install jekyll
15-
gem install kramdown
16-
```
17-
18-
Fork and clone the repo:
19-
20-
```
21-
git clone git@github.com:ascott1/DOCter.git
22-
cd DOCter
23-
```
24-
Run Jekyll:
25-
26-
```
27-
jekyll serve --baseurl ''
28-
```
29-
30-
31-
## _config.yml
32-
33-
Options within the `_config.yml` file allow you to control the site's title, subtitle, logo, author information, and the left column navigation.
34-
35-
36-
### Project Page URL Structure
37-
38-
**This is an excerpt from the [Jekyll docs](http://jekyllrb.com/docs/github-pages/) on configuring your URL for Project Pages.**
39-
40-
Sometimes it's nice to preview your Jekyll site before you push your `gh-pages` branch to GitHub. However, the subdirectory-like URL structure GitHub uses for Project Pages complicates the proper resolution of URLs. Here is an approach to utilizing the GitHub Project Page URL structure (`username.github.io/project-name/`) whilst maintaining the ability to preview your Jekyll site locally.
41-
42-
1. In `_config.yml`, set the `baseurl` option to `/project-name` -- note the leading slash and the **absence** of a trailing slash.
43-
2. When referencing JS or CSS files, do it like this: `{{ site.baseurl }}/path/to/css.css` -- note the slash immediately following the variable (just before "path").
44-
3. When doing permalinks or internal links, do it like this: `{{ site.baseurl }}{{ post.url }}` -- note that there is **no** slash between the two variables.
45-
4. Finally, if you'd like to preview your site before committing/deploying using `jekyll serve`, be sure to pass an **empty string** to the `--baseurl` option, so that you can view everything at `localhost:4000` normally (without `/project-name` at the beginning): `jekyll serve --baseurl ''`
46-
47-
This way, you can preview your site locally from the site root on localhost, but when GitHub generates your pages from the gh-pages branch all the URLs will start with `/project-name` and resolve properly.
48-
49-
## License
50-
51-
The project is in the public domain, and all contributions to it will be released as such. By submitting a pull request, you are agreeing to waive all rights to your contribution under the terms of the [CC0 Public Domain Dedication](http://creativecommons.org/publicdomain/zero/1.0/).
52-
53-
If you contribute the open source work of others, please mark it clearly in your pull request.
12+
> This project is in the public domain within the United States, and copyright and related rights in the work worldwide are waived through the [CC0 1.0 Universal public domain dedication](https://creativecommons.org/publicdomain/zero/1.0/).
13+
>
14+
> All contributions to this project will be released under the CC0 dedication. By submitting a pull request, you are agreeing to comply with this waiver of copyright interest.

0 commit comments

Comments
 (0)