clean up use of h1 headings.

7 files changed, 27 insertions, 22 deletions

diff --git a/app/views/pages/about-us/partners/en.haml b/app/views/pages/about-us/partners/en.haml
index 9c3c95c..06a4efa 100644
--- a/app/views/pages/about-us/partners/en.haml
+++ b/app/views/pages/about-us/partners/en.haml
@@ -1,9 +1,8 @@
-%p
-  <a href="https://www.calyxinstitute.org/">Calyx Institute</a>
-  is a research, education and legal support group devoted to researching and implementing privacy technology and tools to promote free speech, free expression, civic engagement and privacy rights on the Internet.
+%p <b><a href="https://www.calyxinstitute.org/">Calyx Institute</a></b> is a research, education and legal support group devoted to researching and implementing privacy technology and tools to promote free speech, free expression, civic engagement and privacy rights on the Internet. Calyx plans to be an early adopter of the #{link 'LEAP platform' => 'platform'}.
 
-%p
-  <a href="http://f2c.rfa.org/">Freedom2Connect</a> program is designed to ensure secure communication tools exist for millions of individuals whose online interactions are being monitored or obstructed by repressive governments. Through support of research, development, and implementation of globally-accessible secure communications, freedom2connect champions the goals of Article 19 of the Universal Declaration of Human Rights.
+%p <b><a href="http://f2c.rfa.org/">Freedom2Connect</a></b> program is designed to ensure secure communication tools exist for millions of individuals whose online interactions are being monitored or obstructed by repressive governments. Through support of research, development, and implementation of globally-accessible secure communications, freedom2connect champions the goals of Article 19 of the Universal Declaration of Human Rights.
+
+%p <b><a href="http://giip.org">Global Information Internship Program</a></b> (GIIP) is an educational and service-learning program at the University of California, Santa Cruz. GIIP is creating a new generation of “info-savvy” advocates who use information technology to promote civic participation and social justice. Since 1998, hundreds of GIIP undergraduate student interns have worked to democratize globalization, support world peace, raise environmental awareness, and promote gender equity by upgrading the informational capacity of non-governmental organizations (NGOs) and community groups around the world. GIIP will work with LEAP to conduct usability studies of LEAP software in various contexts around the world.
+
+%p <b><a href="https://riseup.net">Riseup Networks</a></b> is major provider of email, chat, and lists for thousands of activist organizations around the world. Riseup plans to be an early adopter of the #{link 'LEAP platform' => 'platform'}.
 
-%p
-  <a href="https://riseup.net">Riseup Networks</a> is a provider of email, chat, and lists for activist organizations.
\ No newline at end of file
diff --git a/app/views/pages/about-us/vision/en.haml b/app/views/pages/about-us/vision/en.haml
index 1de129b..c6c7a3b 100644
--- a/app/views/pages/about-us/vision/en.haml
+++ b/app/views/pages/about-us/vision/en.haml
@@ -1,4 +1,4 @@
-%h2.first The Right to Whisper
+%h1.first The Right to Whisper
 
 %p LEAP fights for the right to whisper.
 
@@ -8,7 +8,7 @@
 
 %p The stakes could not be higher. Activists are dying because their communication technologies betray their identity, location, and conversations. When activists attempt to secure their communications, they face confusing software, a dearth of secure providers, and a greater risk of being flagged as potential troublemakers. In other words, <b>problems of usability, availability, and adoption</b>.
 
-%h2 Our vision
+%h1 Our vision
 
 %p The LEAP vision is to attack these problems of usability, availability, and adoption head on.
 
diff --git a/app/views/pages/services/en.haml b/app/views/pages/services/en.haml
index 6535126..94f8a01 100644
--- a/app/views/pages/services/en.haml
+++ b/app/views/pages/services/en.haml
@@ -1,4 +1,8 @@
-%p LEAP's multi-year plan to secure everyday communication breaks down into discrete services, to be rolled out one at a time. When we introduce a new service, integrated support will be added to both the user-facing #{link 'client'} and the server-side #{link 'platform'}. All communication content will be client-side encrypted, and as much of the metadata as possible. Most importantly, all LEAP services will be based on our prosed system of #{link 'federated secure identity' => 'identity'} and #{link 'unmappable routing' => 'routing'}.
+%h1.first User Services
+
+%p LEAP's multi-year plan to secure everyday communication breaks down into discrete services, to be rolled out one at a time. When we introduce a new service, integrated support will be added to both the user-facing #{link 'client'} and the server-side #{link 'platform'}. All communication content will be client-side encrypted, and as much of the metadata as possible. Most importantly, all LEAP services will be based on our plan for #{link 'federated secure identity' => 'identity'} and #{link 'unmappable routing' => 'routing'}.
+
+%h2 Roadmap
 
 %h3 Phase 1 - Encrypted Internet Proxy
 
diff --git a/app/views/pages/technology/client/en.haml b/app/views/pages/technology/client/en.haml
index 17dacac..40721f4 100644
--- a/app/views/pages/technology/client/en.haml
+++ b/app/views/pages/technology/client/en.haml
@@ -1,3 +1,5 @@
+%h1.first Client-server integration
+
 %p The LEAP Client will run on the user's device and grant the user access to the #{link 'cloud-based services' => 'services'} of the #{link 'LEAP Platform' => 'platform'}. As new services are added to the LEAP Platform, the LEAP Client will be developed in tandem to work with these services.
 
 %h1 Client crypto, cloud assistance
diff --git a/app/views/pages/technology/critiques/en.haml b/app/views/pages/technology/critiques/en.haml
index 8eb6019..06fccdd 100644
--- a/app/views/pages/technology/critiques/en.haml
+++ b/app/views/pages/technology/critiques/en.haml
@@ -1,11 +1,11 @@
-:textile
-  Here is a collection of some of the critiques we have heard or anticipate.
+%h1.first Anticipated Critiques
 
-  h3. Isn't LEAP too ambitious?
+:textile
+  h2. Isn't LEAP too ambitious?
 
   Yes. However, someone needs to be working on a long term plan to add real security and usability to federated messaging architectures. It will not be easy, but we think it is possible.
 
-  h3. Isn't LEAP just like FreedomBox?
+  h2. Isn't LEAP just like FreedomBox?
 
   LEAP and FreedomBox share a similar goal of ensuring that everyone has the right to communicate securely and without censorship. However, the projects use different strategies for achieving this goal.
 
@@ -16,7 +16,7 @@
 
   In the long run, FreedomBox has a lot of potential. But for the foreseeable future, we think it is important to also pursue the LEAP strategy.
 
-  h3. We should not encourage users to store any data in the cloud, encrypted or not
+  h2. We should not encourage users to store any data in the cloud, encrypted or not
 
   Even the best encryption is no guarantee of confidentiality; data in the cloud always has the potential to be decrypted by a determined attacker.
 
@@ -28,7 +28,7 @@
 
   There are many tools and projects out there to help a user do this. LEAP is designed for a different audience, one not adequately addressed by existing technology: people who want high security but don't have the capacity to become highly skilled in self-managing their encryption. There is room--and need--for both approaches, and it is likely that the amount of people who want high security but do not have the time or skills to adequately self-manage their own environment is already large and increasingly rapidly.
 
-  h3. If you make your system architecture public, then you have given adversaries a blueprint to attack you
+  h2. If you make your system architecture public, then you have given adversaries a blueprint to attack you
 
   This is, of course, similar to the arguments about the security of FLOSS. Openness can indeed lead to attacks, but more eyes leads to better security.
 
@@ -36,17 +36,17 @@
 
   Monoculture and openness are both interesting issues that could pose problems for the future. We can only be diligent in assessing LEAP once it is deployed by a variety of organizations. With enough flexibility in configuration, it may be that each LEAP deployment is sufficiently distinct from the others to mitigate these concerns.
 
-  h3. Users will not be willing to download a custom client
+  h2. Users will not be willing to download a custom client
 
   This will indeed be the case for a large number of potential users. Because meaningful levels of security cannot be achieved using current technology without a custom client, our hope is that a critical mass of users can be induced to use one. There are two parts to this inducement: increasing awareness as to why an extra step to ensure security is worthwhile, and decreasing the difficulty in actually taking this step. With sufficient education and an improved user experience, many users should be willing to install a custom client.
 
   On the other hand, rapid developments in Javascript and web browser technology have raised the possibility of running advanced client applications within the browser itself. In this case, a user would not have to install any additional software. However, in-browser crypto is still an area of active research but is currently not safe for deployment, with some areas still to be worked out (like sufficient entropy). LEAP does not depend upon the presence of cryptography in the browser, but would benefit from this should it become viable. The lead W3C employee who began the standardization of Javascript Cryptography is on the board of LEAP, and he will liaise tightly with LEAP as the work matures.
 
-  h3. Users who need security often don't have their own device or access to the internet
+  h2. Users who need security often don't have their own device or access to the internet
 
   This is absolutely true. The digital divide is alive and well, and LEAP does nothing to bridge the gap between the technological haves and have-nots. However, in the long run, IP-based communication--dependent upon advanced devices such as smart phones--is likely to replace most other forms of communication. The cost of such IP-based communication devices and their connectivity is declining rapidly. It behooves us to lay the groundwork now for a secure IP-based communication infrastructure, both for the people who currently rely on the internet and for the next billion who will gain access to the internet in the near future.
 
-  h3. Client encryption is excessive for most people
+  h2. Client encryption is excessive for most people
 
   The argument against client encryption is something like this: a secure connection is good enough, so long as the service provider is located in a country with adequate legal protection and without repressive laws.
 
diff --git a/app/views/pages/technology/en.haml b/app/views/pages/technology/en.haml
index 83a6d6a..bc60a94 100644
--- a/app/views/pages/technology/en.haml
+++ b/app/views/pages/technology/en.haml
@@ -1,4 +1,4 @@
-%h1.first Key Technologies
+%h1.first The Technology of LEAP
 
 %p The long term LEAP plan consists of a set of #{link 'communication services' => 'services'} built upon the core technologies detailed here.
 
diff --git a/app/views/pages/technology/platform/en.haml b/app/views/pages/technology/platform/en.haml
index 871122a..44bbce9 100644
--- a/app/views/pages/technology/platform/en.haml
+++ b/app/views/pages/technology/platform/en.haml
@@ -1,10 +1,10 @@
-%h2.first git clone leap-platform
+%h1.first git clone leap-platform
 
 %p The LEAP Provider Platform is the server-side part of LEAP that is run by service providers. It consists of a set of complementary packages and recipes to automate the maintenance of LEAP services in a hardened GNU/Linux environment. Our goal is to make it painless for service providers and ISPs to deploy a secure communications platform.
 
 %p The LEAP Platform is essentially a git repository of puppet recipes, with a few scripts to help with bootstrapping and deployment. A service provider who wants to deploy LEAP services will clone or fork this repository, edit the main configuration file to specify which services should run on which hosts, and run scripts to deploy this configuration.
 
-%h2 More providers, please
+%h1 More providers, please
 
 %p We believe that the best way to defend the right to whisper is to bring encryption technology into wider adoption. Despite growing awareness of the importance of communication security, users who attempt to adopt better practices still have few places they can turn.