Resolve merge conflict

cisagov · May 31, 2024 · adc3daf · adc3daf
2 parents ac21eff + 1442d30
commit adc3daf
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/_includes/featured-dotgov.html b/_includes/featured-dotgov.html
@@ -6,9 +6,9 @@ <h2 class="usa-alert__heading font-sans-xl">
         Featured .gov
       </h2>
       <h4 class="font-heading-lg text-semibold margin-top-205 margin-bottom-205">
-        <a class="usa-link usa-link--external" rel="noopener noreferrer" href="https://read.gov/">Read.gov</a>
+        <a class="usa-link usa-link--external" rel="noopener noreferrer" href="https://everykidoutdoors.gov/">EveryKidOutdoors.gov</a>
       </h4>
-      <p>Managed by the Library of Congress, Read.gov invites all people to discover the fascinating ideas, places, and events that await you within each book.</p>
+      <p>Every Kid Outdoors is an interagency collaboration that enables fourth graders and their families to discover America's diverse wildlife, natural resources, and history for free.</p>
       <p><a class="usa-link" href="{{ '/about/data' | url }}">Explore .gov data</a></p>  
     </div>
 </div>
diff --git a/pages/help/help_faq.md b/pages/help/help_faq.md
@@ -88,7 +88,7 @@ As part of launching our new registrar, we extended expiration dates for .gov do
 If you received an email that your domain is about to expire, that notification is outdated. We are rebuilding our renewal/expiration process. We’ll keep domain managers updated on our progress. 
 
 ## Where can I add DNS records? {#dns-records}
-To add or update DNS records like A, MX, CNAME, or TXT, you need to make changes at your DNS hosting provider. We don’t offer [DNS hosting services](https://get.gov/domains/moving/#find-dns-hosting-services) at this time. Your provider operates your domain’s name servers, which appear as NS records in the .gov registar.
+To add or update DNS records like A, MX, CNAME, or TXT, you need to make changes at your DNS hosting provider. We don’t offer [DNS hosting services](https://get.gov/domains/moving/#find-dns-hosting-services) at this time. Your provider operates your domain’s name servers, which appear as NS records in the .gov registrar.
 
 If you’re unsure who your DNS hosting provider is, sign in to the .gov registrar and review your domain’s NS records. These are your name servers, which are managed by your hosting provider. The domain in the NS record is often the name of the website where you can update your DNS records.
 
@@ -117,4 +117,4 @@ Not all government activities that involve money constitute “commercial purpos
 * Conducting the functions for publicly controlled enterprises, like fairs, theaters, zoos, or auctions 
 * Publishing third-party news about important events affecting the public 
 
-Your organization may need to comply with additional requirements around "commercial purposes" that impact what you can promote online (e.g., state law, organizational policies). 
+Your organization may need to comply with additional requirements around "commercial purposes" that impact what you can promote online (e.g., state law, organizational policies).