Convert #usa

_includes/components/panel.html

@@ -10,7 +10,7 @@
         {% if include.list %}
         <div class="card-body">
             <ol class="card-ol">
-                {{ include.list | markdownify | replace:"&lt;":"<" | replace:"&gt;":">" }}
+                {{ include.list | markdownify | replace:"&lt;":"<" | replace:"&gt;":">" | remove:"<ul>" | remove:"</ul>" }}
             </ol>
         </div>
         {% else %}

_includes/content/usa.md

@@ -0,0 +1,17 @@
+{% include section_config section=include.section lang=include.lang %}
+
+<h3 id="usa" class="anchor">{{ title }}</h3>
+
+<img src="/assets/img/layout/USA.png" class="img-fluid float-right" alt="USA" style="margin-left:10px;">
+
+{{ description }}
+
+### {{ related_information }}
+
+- [Avoid all US and UK based services](https://www.bestvpn.com/the-ultimate-privacy-guide/#avoidus)
+- [Proof that warrant canaries work based on the surespot example.](https://en.wikipedia.org/wiki/Surespot#History)
+- [The United Kingdom – United States of America Agreement (UKUSA)](https://en.wikipedia.org/wiki/UKUSA_Agreement)
+- [Lavabit: Suspension and gag order](https://en.wikipedia.org/wiki/Lavabit#Suspension_and_gag_order)
+- [Key disclosure law](https://en.wikipedia.org/wiki/Key_disclosure_law)
+- [Wikipedia Portal: Mass_surveillance](https://en.wikipedia.org/wiki/Portal:Mass_surveillance)
+

_includes/index.html

@@ -5,7 +5,7 @@
   <div class="jumbotron p-5">
     <!-- header just below the navigation bar -->
     <h1 class="display-4"><a href="https://www.privacytools.io/" title="privacytools.io"><img src="/assets/img/layout/logo.png" class="img-fluid" alt="privacytools.io"></a></h1>
-    <p class="lead">{{ subheading }}</p>
+    <p class="lead">{{ site_subheading }}</p>
     <!-- end header just below the navigation bar -->
   </div>
 
@@ -31,30 +31,13 @@
   {% include section name="nothing_to_hide" %}
   {% include section name="fourteen_eyes" %}
   {% include section name="key_disclosure_law" %}
+  {% include section name="usa" %}
 
-  <h3 id="usa" class="anchor">Why is it not recommended to choose a US-based service?</h3>
-
-  <img src="/assets/img/layout/USA.png" class="img-fluid float-right" alt="USA" style="margin-left:10px;">
-
-  <p>Services based in the United States are not recommended because of the country’s surveillance programs, use of <a href="https://www.eff.org/issues/national-security-letters/faq">National Security Letters</a> (NSLs) and accompanying gag orders, which
-  forbid the recipient from talking about the request. This combination allows the government to <a href="https://www.schneier.com/blog/archives/2013/08/more_on_the_nsa.html">secretly force</a> companies to grant complete access to customer data and
-  transform the service into a tool of mass surveillance.</p>
-
-  <p>An example of this is <a href="https://en.wikipedia.org/wiki/Lavabit#Suspension_and_gag_order">Lavabit</a> – a discontinued secure email service created by Ladar Levison. The FBI <a href="https://motherboard.vice.com/en_us/article/nzz888/lavabit-founder-ladar-levison-discusses-his-federal-battle-for-privacy">requested</a>			Snowden’s records after finding out that he used the service. Since Lavabit did not keep logs and email content was stored encrypted, the FBI served a subpoena (with a gag order) for the service’s SSL keys. Having the SSL keys would allow them to access
-  communications (both metadata and unencrypted content) in real time for all of Lavabit’s customers, not just Snowden's.</p>
-
-  <p>Ultimately, Levison turned over the SSL keys and <a href="https://www.theguardian.com/commentisfree/2014/may/20/why-did-lavabit-shut-down-snowden-email">shut down</a> the service at the same time. The US government then <a href="http://www.cnbc.com/id/100962389">threatened Levison with arrest</a>,
-  saying that shutting down the service was a violation of the court order.</p>  <h3>Related Information</h3>
-  <ul>
-    <li><a href="https://www.bestvpn.com/the-ultimate-privacy-guide/#avoidus">Avoid all US and UK based services</a></li>
-    <li><a href="https://en.wikipedia.org/wiki/Surespot#History">Proof that warrant canaries work based on the surespot example.</a></li>
-    <li><a href="https://en.wikipedia.org/wiki/UKUSA_Agreement">The United Kingdom – United States of America Agreement (UKUSA)</a></li>
-    <li><a href="https://en.wikipedia.org/wiki/Lavabit#Suspension_and_gag_order">Lavabit: Suspension and gag order</a></li>
-    <li><a href="https://en.wikipedia.org/wiki/Key_disclosure_law">Key disclosure law</a></li>
-    <li><a href="https://en.wikipedia.org/wiki/Portal:Mass_surveillance">Wikipedia Portal: Mass_surveillance</a></li>
-  </ul>  <h1 id="vpn" class="anchor"><a href="#vpn"><i class="fas fa-link anchor-icon"></i></a> VPN providers with extra layers of privacy</h1>
+  <h1 id="vpn" class="anchor"><a href="#vpn"><i class="fas fa-link anchor-icon"></i></a> VPN providers with extra layers
+    of privacy</h1>
   <div class="alert alert-success" role="alert">
-    <strong>All providers listed here are outside the US, use encryption, accept Bitcoin, support OpenVPN and have a no logging policy.</strong>
+    <strong>All providers listed here are outside the US, use encryption, accept Bitcoin, support OpenVPN and have a no
+      logging policy.</strong>
   </div>
 
   <!-- START VPN TABLE -->

_includes/langs/key_disclosure_law

@@ -4,4 +4,4 @@
 {% assign apply = include.lang.apply | default: include.en.apply %}
 {% assign may_apply = include.lang.may_apply | default: include.en.may_apply %}
 {% assign dont_apply = include.lang.dont_apply | default: include.en.dont_apply %}
-{% assign note = include.lang.note | default: include.en.note %}
+{% assign footnote = include.lang.footnote | default: include.en.footnote %}

_includes/langs/usa

@@ -0,0 +1 @@
+{% assign title = include.lang.title | default: include.en.title %}

_includes/section_config

@@ -1,4 +1,4 @@
 {% assign lang = site.data.lang.[include.lang].[include.section] %}
 {% assign en = site.data.lang.en.[include.section] %}
-{% include langs/{{include.section}} lang=lang en=en %}
-{% include langs/_general lang=include.lang %}
+{% include langs/_general lang=include.lang %}
+{% include langs/{{include.section}} lang=lang en=en %}