Skip to content

Commit e47728a

Browse files
committed
add new FAQ & fix a link
1 parent 1f4df37 commit e47728a

1 file changed

Lines changed: 18 additions & 1 deletion

File tree

about/faq.md

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ The [JOSS RtD site](https://joss.readthedocs.io/en/latest/submitting.html) descr
149149
{% capture alertContent %}
150150

151151
* Repositories within the LLNL organization are owned and managed by LLNL. Please do not create personal repositories here.
152-
* All LLNL repos must go through the IM process (see the FAQ [How do I get my repo reviewed and released for GitHub?](/about/faq/#how-do-i-get-my-repo-reviewed-and-released-for-github)) and display the appropriate open source license and `LLNL-CODE-xxxxxx` release number.
152+
* All LLNL repos must go through the IM process (see the FAQ [How do I get my repo reviewed and released for GitHub?](https://software.llnl.gov/about/faq/#released)) and display the appropriate open source license and `LLNL-CODE-xxxxxx` release number.
153153
* If the repo wasn't developed at LLNL, its license needs to be clearly indicated. See the [LLNL Software Licensing](/about/licenses) page for examples.
154154

155155
{% endcapture %}
@@ -241,6 +241,23 @@ Migrating the repo outside of the LLNL organization requires an organization adm
241241
{% assign accordionContent = accordionContent | markdownify %}
242242
{% include components/accordion.html title='My repo has grown. How do I move it out of the LLNL organization?' slug='transfer-out' content=accordionContent %}
243243

244+
{% capture accordionContent %}
245+
<!-- START: Warning Box -->
246+
{% capture alertContent %}
247+
248+
Even if your collection of repos are housed under another organization but developed on behalf of LLNL, they must go through the IM process (see the FAQ [How do I get my repo reviewed and released for GitHub?](https://software.llnl.gov/about/faq/#released)) and display the appropriate open source license and `LLNL-CODE-xxxxxx` release number.
249+
250+
{% endcapture %}
251+
{% assign alertContent = alertContent | markdownify %}
252+
{% include components/alert.html type="warning" icon="fa-circle-info" content=alertContent %}
253+
<!-- END: Warning Box -->
254+
255+
Follow the instructions in the question [How do I include my repo in the LLNL organization and/or this website’s catalog?](https://software.llnl.gov/about/faq/#catalog) beginning with the second bullet point since you are not transferring the organization to LLNL.
256+
257+
{% endcapture %}
258+
{% assign accordionContent = accordionContent | markdownify %}
259+
{% include components/accordion.html title='I need to create repos under a new org for business reasons. Can I still include them in this catalog?' slug='new-org' content=accordionContent %}
260+
244261
{% capture accordionContent %}
245262
Refer to individual projects for their requirements on accepting contributions. (To contribute to this website, see our [Contributing Guidelines](/about/contribute).) In general, though, we follow the "fork and pull" Git workflow model:
246263

0 commit comments

Comments
 (0)