Skip to content

Commit ea80ca4

Browse files
authored
Merge pull request #174 from deptofdefense/fix-uswds-3.0
Upgrade yml files to support uswds-jekyll 3.0
2 parents a8d448d + 7eadd83 commit ea80ca4

4 files changed

Lines changed: 23 additions & 27 deletions

File tree

_data/footer.yml

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
11
top: true
22

3-
# The optional heading for the footer.
43
heading: Code.mil
54

6-
# An array of agency logos to show, side by side, in the lower left
7-
# of the footer on large screens.
8-
# If the logo is external add external: true
95
logos:
106
- src: /assets/images/dod_seal.svg
117
alt: DoD
@@ -15,7 +11,7 @@ logos:
1511
external: false
1612

1713
contact:
18-
links:
14+
social_links:
1915
- text: <span class='usa-link-twitter usa-social_link' title='Twitter'><span>Twitter</span></span>
2016
href: https://twitter.com/DefenseDigital
2117
external: true
@@ -25,8 +21,7 @@ contact:
2521
- text: <span class='usa-link-medium usa-social_link' title='Medium'><span>Medium</span></span>
2622
href: https://medium.com/defense-digital-service
2723
external: true
28-
2924
heading: Contact us
30-
31-
address: |
32-
[{{site.email}}](mailto:{{site.email}})
25+
contact_links:
26+
- text: code@dds.mil
27+
href: mailto:{{site.email}}

_data/header.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1+
usa_banner: true
12

2-
# header types can be 'basic' or 'extended'
33
type: extended
44

55
secondary:
6-
# this is a key into _data/navigation.yml
76
links: top

_data/navigation.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
top:
22
- text: Why Open Source
33
href: /why-open-source.html
4-
- text: Get Started
4+
- text: Getting Started
55
href: /getting-started.html
6-
- text: FAQ
6+
- text: How to Open Source
7+
href: /how-to-open-source.html
8+
- text: FAQs
79
href: /frequently-asked-questions.html
810

911
side:

_pages/frequently-asked-questions.md

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ subnav:
99
href: "/frequently-asked-questions.html#what-is-codemil"
1010
---
1111

12-
# What is Code.mil?
12+
## What is Code.mil?
1313

1414
Code.mil is an experiment in open source at the U.S. Department of Defense (DoD). The goal is to foster open collaboration with the developer community across the world on DoD open source projects.
1515

@@ -23,70 +23,70 @@ We're now in a sustaining phase where we are expanding the effort to include pro
2323

2424
This initiative is not intended to set DoD policy, but rather is exploring alternate ways to join the open source and free software communities.
2525

26-
# Who is behind Code.mil?
26+
## Who is behind Code.mil?
2727

2828
The [Defense Digital Service](https://dds.mil) (DDS) launched Code.mil on February 22, 2017. Established on November 18, 2015 by the Secretary of Defense, DDS brings in the best private sector talent, technology, and processes to DoD. DDS functions like a SWAT team of nerds working on high impact challenges during one to two year tours of duty as federal employees. DDS is an agency team of the [United States Digital Service](https://usds.gov).
2929

30-
# Who has been involved with Code.mil?
30+
## Who has been involved with Code.mil?
3131

3232
DDS has collaborated extensively with organizations in the open source and free software communities, such as the Free Software Foundation (FSF), the Open Source Initiative (OSI), and GitHub. DDS also reached out to open source experts and attorneys across the U.S. Federal government and in the private sector.
3333

34-
# How does Code.mil relate to Code.gov?
34+
## How does Code.mil relate to Code.gov?
3535

3636
We launched Code.mil to further the mission of [Code.gov](https://code.gov) within DoD. We are in close collaboration with the team at Code.gov to expand upon government reuse and public access to custom-developed Federal source code. Projects hosted on Code.mil will also be accessible through the Code.gov platform.
3737

38-
# Why is DoD doing this?
38+
## Why is DoD doing this?
3939

4040
U.S. military members and their families make significant sacrifices to protect our country. Their lives should not be negatively impacted by outdated tools and software development practices that lag far behind private sector standards.
4141

4242
Modern software is open sourced software. The creative contribution of individual developers to help solve complex problems of impact is largely untapped by DoD. Through this experiment, we are trying to more actively participate in the open source and free software communities. We need your help to build better software products and services for our military members and citizens across the country.
4343

44-
# Where can I find other DoD open source projects?
44+
## Where can I find other DoD open source projects?
4545

4646
There are many other projects that have already been open sourced. They are located in various places such as GitHub, SourceForge, forge.mil, Google Code, and numerous other web sites. We're working to inventory and catalog many of these, but you can find some of them using the [`code-mil` topic on GitHub](https://github.com/topics/code-mil)
4747

48-
# I am part of DoD or a Military Department and want to have my project hosted on Code.mil. What do I do?
48+
## I am part of DoD or a Military Department and want to have my project hosted on Code.mil. What do I do?
4949

5050
That's awesome! Please get the conversation going by [submitting your information here](https://docs.google.com/forms/d/e/1FAIpQLSebDzfqkH8ANSuqQFqValypmceVxNfEzOxMURfQQBAt4IgFQw/viewform?usp=sf_link) so we can start talking.
5151

52-
# What happened to the draft Defense Open Source Agreement?
52+
## What happened to the draft Defense Open Source Agreement?
5353

5454
The original open source strategy explored an innovative legal pathway of using contract law to attach widely adopted licenses to our projects. This strategy was encapsulated in the draft Defense Open Source Agreement. The developer community energetically responded to our call for comment, and we received a lot of great feedback. Thank you!
5555

5656
Based on the feedback, we updated our strategy to move away from contract law and instead focus on the contribution process. We deleted the draft Defense Open Source Agreement in the LICENSE-agreement.md file. Our updated strategy is now captured in [`INTENT.md`](/INTENT.md) and [`CONTRIBUTING.md`](/CONTRIBUTING.md).
5757

5858
We think the updated strategy avoids the complications of using contract law and also the perception that we're creating a new license. We hope this will keep our practices more consistent with the open source and free software communities. We intend to use widely adopted licenses for our projects when copyright is applicable.
5959

60-
# How are you attaching licenses to your projects? Are they just public domain?
60+
## How are you attaching licenses to your projects? Are they just public domain?
6161

6262
Works created by U.S. Federal government employees within the scope of their employment is ineligible for copyright protections in the U.S. and certain foreign jurisdictions. People sometimes say that U.S. law requires Federal government employees to put creative works in the public domain, but that's not quite right. The U.S. Copyright Act does not explicitly define public domain. What the Act actually does is make works created by U.S. Federal government employees ineligible for copyright protections (17 U.S.C. 105). Public domain is generally understood to refer to creative materials that are not protected by intellectual property laws such as copyright, trademark, or patent laws. Under U.S. laws, Government-created works may be eligible for patent or trademark protections. Not all countries acknowledge the concept of public domain.
6363

6464
The updated strategy in [`INTENT.md`](/INTENT.md) does not attempt to attach licenses to Government-written code. Rather, the strategy attaches the license to copyrighted contributions by using the Developer Certificate of Origin (DCO) process and to Government-written code in countries where that code is eligible for copyright protections.
6565

66-
# Why not just put Government-written code in the public domain and use CC0 1.0 Universal for copyrighted contributions and jurisdictions where you have copyright?
66+
## Why not just put Government-written code in the public domain and use CC0 1.0 Universal for copyrighted contributions and jurisdictions where you have copyright?
6767

6868
Good point! We definitely considered this. CC0 1.0 Universal seeks to dedicate copyrighted work to the public domain by waiving the author's rights to the work worldwide under copyright law. Using CC0 1.0 Universal is one possibility, but not the only one. There are many high quality and widely adopted open source and free software licenses, each with their own advantages and disadvantages. We are not intending to judge the merit of using CC0 1.0 Universal. Rather, we are positing that the project maintainer should have the freedom of choice when it comes to selecting the "best" license for that particular project.
6969

7070
Intelligent minds will differ on the "best" avenue for a U.S. Federal government agency to participate in open source. The reality is that every organization, and every project, has unique circumstances that affect which option might make the most sense. This initiative is not intended to set DoD policy, but rather is exploring alternate ways for joining the open source community.
7171

72-
# How are you handling code contributions?
72+
## How are you handling code contributions?
7373

7474
We are using the [Developer Certificate of Origin](https://developercertificate.org) process. The DCO is a legally binding statement asserting that you are the creator of your contribution, or that you otherwise have the authority to distribute the contribution, and that you are intentionally making the contribution available under the license associated with the project. The intent is to use widely adopted open source and free software licenses.
7575

7676
We considered other mechanisms, such as a Contributor Licensing Agreement or copyright assignment, but chose DCO because it reuses the license associated with the project rather than crafting new licensing language; is not administratively burdensome to implement; and is commonly used in the developer community.
7777

78-
# What is the liability of a contributor?
78+
## What is the liability of a contributor?
7979

8080
Under the DCO, a contribution is submitted under the open source license associated with the project, which will have warranty and liability disclaimers. The licenses we are considering disclaim warranties and provide the code AS IS.
8181

82-
# What do I need to know if I fork the project?
82+
## What do I need to know if I fork the project?
8383

8484
What you need to do if you fork the project depends on the status of the project at the time you fork it. Per [`INTENT.md`](/INTENT.md), the intent is that the project should be treated as if it is licensed under the license associated with the project in the `LICENSE.md` file. Whether `LICENSE.md` has actually attached depends on the status of the project at the time you fork it.
8585

8686
* If the project includes no copyrighted code (so there have been no merged copyrighted contributions and your jurisdiction does not recognize copyright for U.S. Government-written work), then 'LICENSE.md' has not attached to the project.
8787
* If the project includes copyrighted code (so there are merged copyrighted contributions or your jurisdiction recognizes copyright for U.S. Government-written work), then `LICENSE.md` has attached to the project and you must comply with the terms of the license. The authors and contributors are listed in `CONTRIBUTORS.md` and, in some cases, the source file headers.
8888

89-
# Is DoD trying to do something funny here?
89+
## Is DoD trying to do something funny here?
9090

9191
No!
9292

0 commit comments

Comments
 (0)