Merge pull request #91 from cisagov/improvement/eradicate-trio-refere…

…nces Eradicate Trio references
cisagov · Jun 30, 2023 · 84ebd41 · 84ebd41
2 parents 807a7fe + ec8f193
commit 84ebd41
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/config/gitleaks.toml b/config/gitleaks.toml
@@ -30,7 +30,7 @@ title = "gitleaks config"
 	tags = ["email"]
 	[rules.allowlist]
 		regexes = ['''(?i)@(github.com|test.org)''',
-			'''(?i)@(trio.dhs.gov|cisa.dhs.gov|beta.dhs.gov|hq.dhs.gov)''',
+			'''(?i)@(beta|cisa|gwe.cisa|hq|trio).dhs.gov''',
 			'''(?i)(Author|Copyright|Contact|MAINTAINER)''']
 		pathes = ['''Godeps._workspace''']
 

diff --git a/dev_envs/mac-env-setup.md b/dev_envs/mac-env-setup.md
@@ -173,7 +173,7 @@ gpg --gen-key
 ```
 
 Follow the prompts for name and email address, using either your CISA
-or Trio email address. The output should look like:
+or GWE email address. The output should look like:
 
 ```console
 We need to generate a lot of random bytes. It is a good idea to perform

diff --git a/open-source-policy/policy.md b/open-source-policy/policy.md
@@ -166,5 +166,4 @@ This policy is a living document. CISA expects to make changes to this policy in
 the future, and we welcome
 [issues](https://github.com/cisagov/development-guide/issues) and [pull
 requests](https://github.com/cisagov/development-guide/pulls). To contact us
-privately, email
-[[email protected]](mailto:[email protected]).
+privately, email [[email protected]](mailto:[email protected]).
diff --git a/open-source-policy/practice.md b/open-source-policy/practice.md
@@ -68,7 +68,7 @@ official capacity.
 1. See if there is an organizational CLA available
 1. Send the agreement to DHS's Office of General Counsel (OGC) for review
     - Email
-      [cisagov-github-group@trio.dhs.gov](mailto:cisagov-github-group@trio.dhs.gov)
+      [github@cisa.dhs.gov](mailto:github@cisa.dhs.gov)
       to determine the best contact
 1. Collect names/emails/GitHub usernames (whatever is needed) for folks you
 think will be contributing
@@ -129,7 +129,7 @@ All CISA team members are expected to make new source code
 repositories public from the time of creation. This means we often
 publish drafts in our repos that may change substantially. If you're
 interested in learning more about the contents of a repo, email
-[cisagov-github-group@trio.dhs.gov](mailto:cisagov-github-group@trio.dhs.gov)
+[github@cisa.dhs.gov](mailto:github@cisa.dhs.gov)
 and we'll direct you to the right person or team.
 
 ## Protecting sensitive information ##