Merge pull request #1638 from cisagov/ko/request-form-updates2

Domain-request content updates (Part 2)

src/registrar/assets/sass/_theme/_typography.scss

@@ -22,3 +22,9 @@ h2 {
   margin: units(4) 0 units(1);
   color: color('primary-darker');
 }
+
+// Normalize typography in forms
+.usa-form,
+.usa-form fieldset {
+  font-size: 1rem;
+}

src/registrar/templates/application_anything_else.html

@@ -2,7 +2,9 @@
 {% load field_helpers %}
 
 {% block form_instructions %}
-  <p>Is there anything else you'd like us to know about your domain request? This question is optional.</p>
+    <h2>Is there anything else you’d like us to know about your domain request?</h2> 
+
+    <p>This question is optional.</p>
 {% endblock %}
 
 {% block form_required_fields_help_text %}

src/registrar/templates/application_dotgov_domain.html

@@ -2,24 +2,22 @@
 {% load static field_helpers url_helpers %}
 
 {% block form_instructions %}
-  <p>Before requesting a .gov domain, <a class="usa-link" rel="noopener noreferrer" target="_blank" href="{% public_site_url 'domains/choosing' %}">please make sure it
-  meets our naming requirements</a>. Your domain name must:
+  <p>Before requesting a .gov domain, please make sure it meets <a class="usa-link" rel="noopener noreferrer" target="_blank" href="{% public_site_url 'domains/choosing' %}">our naming requirements</a>. Your domain name must:
     <ul class="usa-list">
       <li>Be available </li>
-      <li>Be unique </li>
       <li>Relate to your organization’s name, location, and/or services </li>
       <li>Be clear to the general public. Your domain name must not be easily confused
       with other organizations.</li>
     </ul>
   </p>
 
+  <p>Names that <em>uniquely apply to your organization</em> are likely to be approved over names that could also apply to other organizations. In most instances, this requires including your state’s two-letter abbreviation.</p> 
+
+  <p>Requests for your organization’s initials or an abbreviated name might not be approved, but we encourage you to request the name you want.</p> 
+
   <p>Note that <strong>only federal agencies can request generic terms</strong> like
   vote.gov.</p>
 
-  <p>We’ll try to give you the domain you want. We first need to make sure your request
-  meets our requirements. We’ll work with you to find the best domain for your
-  organization.</p>
-
   <h2 class="margin-top-3">Domain examples for your type of organization</h2>
   <div class="domain_example">
     {% include "includes/domain_example.html" %}
@@ -41,10 +39,7 @@ <h2 class="margin-top-3">Domain examples for your type of organization</h2>
       <h2>What .gov domain do you want?</h2>
     </legend>
 
-    <p id="domain_instructions" class="margin-top-05">After you enter your domain, we’ll make sure it’s
-    available and that it meets some of our naming requirements. If your domain passes
-    these initial checks, we’ll verify that it meets all of our requirements once you
-    complete and submit the rest of this form.</p>
+    <p id="domain_instructions" class="margin-top-05">After you enter your domain, we’ll make sure it’s available and that it meets some of our naming requirements. If your domain passes these initial checks, we’ll verify that it meets all our requirements after you complete the rest of this form.</p>
 
     {% with attr_aria_describedby="domain_instructions domain_instructions2" %}
       {# attr_validate / validate="domain" invokes code in get-gov.js #}
@@ -87,6 +82,4 @@ <h2>Alternative domains (optional)</h2>
 
   </fieldset>
 
-  <p id="domain_instructions2">If you’re not sure this is the domain you want, that’s
-  okay. You can change it later.</p>
 {% endblock %}

src/registrar/templates/application_purpose.html

@@ -2,14 +2,10 @@
 {% load field_helpers url_helpers %}
 
 {% block form_instructions %}
-  <p>.Gov domain names are for use on the internet. Don’t register a .gov to simply reserve a 
-domain name or for mainly internal use.</p>
-
-  <p>Describe the reason for your domain request. Explain how you plan to use this domain. 
-Who is your intended audience? Will you use it for a website and/or email? Are you moving 
-your website from another top-level domain (like .com or .org)? 
-Read about <a class="usa-link" rel="noopener noreferrer" target="_blank" href="{% public_site_url 'domains/requirements/' %}">activities that are prohibited on .gov domains.</a></p>
-
+  <p>.Gov domains are intended for public use. Domains will not be given to organizations that only want to reserve a domain name (defensive registration) or that only intend to use the domain internally (as for an intranet).</p> 
+<p>Read about <a class="usa-link" rel="noopener noreferrer" target="_blank" href="{% public_site_url 'domains/requirements/' %}">activities that are prohibited on .gov domains.</a></p>
+<h2>What is the purpose of your requested domain?</h2>
+<p>Describe how you’ll use your .gov domain. Will it be used for a website, email, or something else?</p>
 {% endblock %}
 
 {% block form_required_fields_help_text %}

src/registrar/templates/application_requirements.html

@@ -3,51 +3,55 @@
 
 {% block form_instructions %}
   <p>Please read this page. Check the box at the bottom to show that you agree to the requirements for operating .gov domains.</p>
-<p>The .gov domain space exists to support a broad diversity of government missions. Generally, we don’t examine how government organizations use their domains. However, misuse of a .gov domain can reflect upon the integrity of the entire .gov space. There are categories of misuse that are statutorily prohibited or abusive in nature.</p>
+<p>The .gov domain space exists to support a broad diversity of government missions. Generally, we don’t review or audit how government organizations use their registered domains. However, misuse of a .gov domain can reflect upon the integrity of the entire .gov space. There are categories of misuse that are statutorily prohibited or abusive in nature.</p>
 
 
-  <h2>What you can’t do with .gov domains</h2>
+  <h2>What you can’t do with a .gov domain</h2>
 
   <h3>Commercial purposes</h3>
 
-  <p>.Gov domains must not be used for commercial purposes, such as advertising that benefits private individuals or entities.</p>
+  <p>A .gov domain must not be used for commercial purposes, such as advertising that benefits private individuals or entities.</p>
 
   <h3>Political campaigns</h3>
 
-  <p>.Gov domains must not be used for political campaigns.</p>
+  <p>A .gov domain must not be used for political campaign purposes, such as the website for a candidate seeking elected office.</p>
 
   <h3>Illegal content</h3>
 
-  <p>.Gov domains must not be used to distribute or promote material whose distribution violates applicable law.</p>
+  <p>A .gov domain must not be used to distribute or promote material whose distribution violates applicable law.</p>
 
   <h3>Malicious cyber activity </h3>
 
-  <p>.Gov is a trusted and safe space. .Gov domains must not distribute malware, host
-  open redirects, or otherwise engage in malicious cyber activity.</p>
+  <p>A .gov domain must not distribute malware, host open redirects, or engage in malicious cyber activity.</p>
 
   <h2>What .gov domain registrants must do</h2>
 
   <h3>Keep your contact information updated</h3>
 
-  <p>.Gov domain registrants must maintain accurate contact information in the .gov registrar.</p>
+  <p>.Gov domain registrants must maintain accurate contact information in the .gov registrar. You will be asked to verify it as part of the renewal process.</p>
 
   <h3>Be responsive if we contact you</h3>
 
-  <p>Registrants should respond promptly to communications about potential violations to these requirements.</p>
+  <p>.Gov domain registrants must respond promptly to communications about potential violations to these requirements.</p>
 
-  <h2>Failure to comply with these requirements could result in domain suspension or termination</h2>
+  <h2>Failure to comply could result in domain suspension or termination</h2>
 
-  <p>We may need to suspend or terminate a domain registration for violations. When we discover a violation, we’ll make reasonable efforts to contact a registrant, including:
+  <p>We may need to suspend or terminate a domain registration for violations of these requirements. When we discover a violation, we’ll make reasonable efforts to contact a registrant, including emails or phone calls to:
     <ul class="usa-list"> 
-      <li>Emails to domain contacts</li>
-      <li>Phone calls to domain contacts</li>
-      <li>Email or phone call to the authorizing official</li>
-      <li>Emails or phone calls to the government organization, a parent organization,
-        or affiliated entities</li>
+      <li>Domain contacts</li>
+      <li>The authorizing official</li>
+      <li>The government organization, a parent organization, or affiliated entities</li>
     </ul>
   </p>
 
-  <p>We understand the critical importance of the availability of .gov domains. Suspending or terminating a .gov domain is reserved for prolonged, unresolved, serious violations where the registrant is non-responsive. We'll make extensive efforts to contact registrants and to identify potential solutions. We'll make reasonable accommodations for remediation timelines based on the severity of the issue.</p>
+  <p>We understand the critical importance of availability for a .gov domain. Suspending or terminating a .gov domain is reserved for prolonged, unresolved, serious violations where the registrant is non-responsive. We'll make extensive efforts to contact registrants and to identify potential solutions. We'll make reasonable accommodations for remediation timelines based on the severity of the issue.</p>
+
+  <h2>Domain renewal</h2>
+
+  <p>.Gov domains are registered for a one-year period. To renew your domain, you'll be asked to verify your organization’s eligibility and your contact information. </p>
+
+  <p>Though a domain may expire, it will not automatically be put on hold or deleted. We’ll make extensive efforts to contact your organization before holding or deleting a domain.</p>
+
 {% endblock %}
 
 {% block form_required_fields_help_text %}

src/registrar/templates/application_your_contact.html

@@ -2,14 +2,11 @@
 {% load field_helpers %}
 
 {% block form_instructions %}
-  <p>We’ll use this information to contact you about your domain request.</p>
+  <p>While reviewing your domain request, we may need to reach out with questions. We’ll also email you when we complete our review.</p>
 
-<p>If you’d like us to use a different name, email, or phone number you can make those 
-  changes below. Changing your contact information here won’t affect your Login.gov
-  account information.</p>
+<h2>What contact information should we use to reach you?</h2>
 
-  <p>The contact information you provide here won’t be public and will only be used to 
-    support your domain request.</p>
+<p>Your contact information won’t be made public and will be used only for .gov purposes. The information you provide here won't impact your Login.gov account information.</p>
 {% endblock %}
 
 

src/registrar/templates/includes/domain_example.html

@@ -40,8 +40,7 @@
   <ul class="usa-list">
     <li>AmericanSamoa.gov</li>
     <li>Colorado.gov</li>
-    <li>Georgia.gov</li>
-    <li>AmericanSamoa.gov </li>
+    <li>MN.gov</li>
     <li>Guam.gov</li>
   </ul>
 
@@ -55,45 +54,49 @@
   </ul>
 
 {% elif organization_type == 'county' %}
-  <p>Most county .gov domains must include the two-letter state abbreviation or the full state name. County names that aren’t shared by any other city, county, parish, town, borough, village or equivalent in the U.S., at the time a domain is granted, can be requested without referring to the state. Counties can include “county” in their domain to distinguish it from other places with similar names. We use the <a class="usa-link usa-link--external" rel="noopener noreferrer" target="_blank" href="https://www.census.gov/geographies/reference-files/time-series/geo/gazetteer-files.html">Census Bureau’s National Places Gazetteer Files</a> to determine if county names are unique.</p>
+  <p>Most county .gov domains must include the two-letter state abbreviation or the full state name. County names that aren’t shared by any other city, county, parish, town, borough, village or equivalent in the U.S. (at the time a domain is granted) don’t have to refer to their state in their domain name. Counties can include “county” in their domain to distinguish it from other places with similar names.</p> 
+
+<p>We use the <a class="usa-link usa-link--external" rel="noopener noreferrer" target="_blank" href="https://www.census.gov/geographies/reference-files/time-series/geo/gazetteer-files.html">Census Bureau’s National Places Gazetteer Files</a> to determine if county names are unique.</p>
   <p><strong>Examples:</strong></p>
   <ul class="usa-list">
-    <li>AdamsCountyMS.gov</li>
-    <li>Erie.gov</li>
+    <li>LACounty.gov</li>
     <li>LivingstonParishLA.gov</li>
     <li>MitchellCountyNC.gov</li>
+    <li>MiamiDade.gov</li>
   </ul>
 
 {% elif organization_type == 'city' %}
   <p>Most city domains must include the two-letter state abbreviation or clearly spell out the state name. Using phrases like “City of” or “Town of” is optional.</p>
-  <p>Cities that meet one of the criteria below don’t have to refer to their state in the domain name.
+  <p>Cities that meet one of the criteria below don’t have to refer to their state in their domain name.
     <ul class="usa-list">
-      <li>City names that are not shared by any other U.S. city, town, or village can be requested without referring to the state. We use the <a class="usa-link usa-link--external" rel="noopener noreferrer" target="_blank" href="https://www.census.gov/geographies/reference-files/time-series/geo/gazetteer-files.html">Census Bureau’s National Places Gazetteer Files</a> to determine if names are unique.</li>
-      <li>Certain cities are so well-known that they may not require a state reference to communicate location. We use the list of U.S. “dateline cities” in the Associated Press Stylebook to make this determination.</li>
-      <li>The 50 largest cities, as measured by population according to the Census Bureau, can have .gov domain names that don’t refer to their state.</li>
+      <li>The city name is not shared by any other U.S. city, town, village, or county. We use the <a class="usa-link usa-link--external" rel="noopener noreferrer" target="_blank" href="https://www.census.gov/geographies/reference-files/time-series/geo/gazetteer-files.html">Census Bureau’s National Places Gazetteer Files</a> to determine if names are unique.</li>
+      <li>The city is so well known that it doesn’t need a state reference to communicate location. We use the list of U.S. “dateline cities” in the Associated Press Stylebook as part of our decision.</li>
+      <li>It’s one of the 150 largest cities by population, <a class="usa-link usa-link--external" rel="noopener noreferrer" target="_blank" href="https://www.census.gov/data/tables/time-series/demo/popest/2020s-total-cities-and-towns.html">according to the Census Bureau.</a></li>
     </ul>
  <p><strong>Examples:</strong></p>
     <ul class="usa-list">
       <li>CityofEudoraKS.gov</li>
-      <li>Pocatello.gov</li>
       <li>WallaWallaWA.gov</li>
+      <li>Pocatello.gov</li>
     </ul>
   </p>
 
 {% elif organization_type == 'special_district' %}
-  <p>Domain names must represent your organization or institutional name, not solely the services you provide. It also needs to include your two-letter state abbreviation or clearly spell out the state name unless <a class="usa-link" rel="noopener noreferrer" target="_blank" href="{% public_site_url 'domains/choosing/#counties' %}">county or city exceptions apply</a>.</p>
+  <p>Domain names must represent your organization or institutional name, not solely the services you provide. It also needs to include your two-letter state abbreviation or clearly spell out the state name.</p>
   <p><strong>Examples:</strong></p>
   <ul class="usa-list">
-    <li>ElectionsShelbyTN.gov</li>
     <li>GlacierViewFire.gov</li>
-    <li>HVcoVote.gov</li>
     <li>TechshareTX.gov</li>
     <li>UtahTrust.gov</li>
   </ul>
 
 {% elif organization_type == 'school_district' %}
   <p>Domain names must represent your organization or institutional name.</p>
-  <p><strong>Example:</strong> mckinneyISDTX.gov </p>
+    <p><strong>Examples:</strong></p>
+  <ul class="usa-list">
+    <li>mckinneyISDTX.gov</li>
+    <li>BooneCSDIA.gov</li>
+  </ul>
 
 
 {%endif %}