Skip to content

Commit 379088d

Browse files
authored
Merge pull request #707 from LLNL/testing
Testing now that I've uninstalled WSL
2 parents 427b0ce + cb629ba commit 379088d

2 files changed

Lines changed: 8 additions & 8 deletions

File tree

about/contributing.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ menus:
1111

1212
<!-- START: Info box -->
1313
{% capture alertContent %}
14-
The LLNL Software Catalog website is an open source project. We welcome contributions via pull requests as well as questions, feature requests, or bug reports via issues. Contact our team at [open-source@llnl.gov](mailto:open-source@llnl.gov) with any questions. Please also refer to our [FAQ](/about/faq) and [Code of Conduct](/about/conduct).
14+
The LLNL Software Catalog website is an open-source project. We welcome contributions via pull requests as well as questions, feature requests, or bug reports via issues. Contact our team at [open-source@llnl.gov](mailto:open-source@llnl.gov) with any questions. Please also refer to our [FAQ](/about/faq) and [Code of Conduct](/about/conduct).
1515
{% endcapture %}
1616
{% assign alertContent = alertContent | markdownify %}
1717
{% include components/alert.html type="warning" icon="fa-circle-info" content=alertContent %}
@@ -77,7 +77,7 @@ A [JSON file](https://github.com/LLNL/llnl.github.io/blob/main/visualize/github-
7777
| -------- | ----------- | ------ | ------- |
7878
| Category | Description | Tag(s) | FA icon |
7979
| -------- | ----------- | ------ | ------- |
80-
| **All Software** | Browse all LLNL open source projects | (no tags required) | (image: `logomark-software.svg`) |
80+
| **All Software** | Browse all LLNL open-source projects | (no tags required) | (image: `logomark-software.svg`) |
8181
| **AI & Machine Learning** | Integrate artificial intelligence and machine learning into scientific applications | `artificial-intelligence`, `deep-learning`, `machine-learning`, `neural-network` | fa-brain-circuit |
8282
| **App Infrastructure** | Browse tools for basic functionality common in HPC codes | `app-infrastructure` | fa-gear-complex-code |
8383
| **Applications** | Browse scientific simulation codes and IT management tools | `application` | fa-laptop-code |
@@ -136,7 +136,7 @@ An LLNL repo with its own logo also needs the image file name added to [`repo_lo
136136
{% include components/accordion.html title='How do I change how a specific repo appears in the catalog?' slug='catalog' content=accordionContent %}
137137

138138
{% capture accordionContent %}
139-
News posts appear in reverse chronological order (i.e., newest first). The list is curated to promote LLNL's open source endeavors and community engagement. Posts should be tagged with at least one of the following categories, which are not associated with the catalog browse categories (described above) applied to repos.
139+
News posts appear in reverse chronological order (i.e., newest first). The list is curated to promote LLNL's open-source endeavors and community engagement. Posts should be tagged with at least one of the following categories, which are not associated with the catalog browse categories (described above) applied to repos.
140140

141141
* `event` - announcement or recap of an event/conference
142142
* `multimedia` - synopsis of a video or podcast published on another platform (e.g., YouTube)

about/index.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: About the LLNL Software Catalog
33
layout: default
4-
description: Learn about LLNL's open source software and why we're committed to creating open source codes whenever feasible.
4+
description: Learn about LLNL's open-source software and why we're committed to creating open-source codes whenever feasible.
55
permalink: /about/
66
breadcrumb: About
77
menus:
@@ -26,11 +26,11 @@ menus:
2626

2727
<div class="row">
2828
<div class="col-12 col-lg-6" markdown="1">
29-
Welcome to the Lawrence Livermore National Laboratory ([LLNL](https://www.llnl.gov/)) software catalog&mdash;a hub for open source software (OSS) produced at the Lab.
29+
Welcome to the Lawrence Livermore National Laboratory ([LLNL](https://www.llnl.gov/)) software catalog&mdash;a hub for open-source software (OSS) produced at the Lab.
3030

3131
LLNL developers create and evolve software on a daily basis. Some of this software is used only internally, other components are licensed for use by external partners and collaborators, and still other software is released and actively developed out in the open on software-hosting platforms. This website is the gateway to all of it.
3232

33-
LLNL is a Department of Energy ([DOE](https://www.energy.gov/national-laboratories)) institution, so we abide by the [Federal Source Code Policy](https://www.energy.gov/articles/doe-federal-source-code-policy)* that guides release of open source software (OSS). And not just because we have to but because we *want* to. Long before GitHub was founded, [we started releasing software](https://software.llnl.gov/visualize/) for public use and collaboration.
33+
LLNL is a Department of Energy ([DOE](https://www.energy.gov/national-laboratories)) institution, so we abide by the [Federal Source Code Policy](https://www.energy.gov/articles/doe-federal-source-code-policy)* that guides release of open-source software (OSS). And not just because we have to but because we *want* to. Long before GitHub was founded, [we started releasing software](https://software.llnl.gov/visualize/) for public use and collaboration.
3434
</div>
3535
<div class="col-12 col-lg-6 mb-3">
3636
<div class="responsive-iframe-container">
@@ -45,7 +45,7 @@ One of the great things about a large government organization is that we're not
4545

4646
Case in point: The DOE's Advanced Simulation and Computing ([ASC](https://asc.llnl.gov)) Program leverages OSS to build, field, and integrate Linux clusters into production service at our [Livermore Computing high-performance computing center](https://hpc.llnl.gov/). ASC is responsible for developing computer simulation capabilities that analyze and predict the performance, safety, and effectiveness of the nation's nuclear stockpile. In other words, the stakes are high for ensuring our code is accurate. With OSS, we can develop quickly and choose the best solutions.
4747

48-
This website abounds with examples of projects that have found a home in the open source community. Access is key, which is why we jumped at the chance to index our software on [Code.gov](https://code.gov). You'll find our work in the DOE [repo list](https://code.gov/#!/browse-projects?agencies=DOE), and we invite you to browse our projects on [GitHub](https://github.com/LLNL).
48+
This website abounds with examples of projects that have found a home in the open-source community. Access is key, which is why we jumped at the chance to index our software on [Code.gov](https://code.gov). You'll find our work in the DOE [repo list](https://code.gov/#!/browse-projects?agencies=DOE), and we invite you to browse our projects on [GitHub](https://github.com/LLNL).
4949

5050
\* The original policy memorandum is no longer available online. For details, please see
5151

@@ -117,7 +117,7 @@ This website abounds with examples of projects that have found a home in the ope
117117
</div>
118118

119119
{% capture ctaContent %}
120-
For more information, check out our [FAQ](/about/faq). Contact [open-source@llnl.gov](mailto:open-source@llnl.gov) with questions about open source software at LLNL. Contact [github-admin@llnl.gov](mailto:github-admin@llnl.gov) with questions about working in the LLNL GitHub organization or to request a private repository. Visit the [software licensing portal](https://softwarelicensing.llnl.gov/) for information about licensing LLNL's proprietary codes.
120+
For more information, check out our [FAQ](/about/faq). Contact [open-source@llnl.gov](mailto:open-source@llnl.gov) with questions about OSS at LLNL. Contact [github-admin@llnl.gov](mailto:github-admin@llnl.gov) with questions about working in the LLNL GitHub organization or to request a private repository. Visit the [software licensing portal](https://softwarelicensing.llnl.gov/) for information about licensing LLNL's proprietary codes.
121121
{% endcapture %}
122122
{% assign ctaContent = ctaContent | markdownify %}
123123
{% include components/call-to-action.html title='Contact' icon='fa-comments-question-check' content=ctaContent %}

0 commit comments

Comments
 (0)