From 92760f1121ad02957b40a59801077e8fb56512b9 Mon Sep 17 00:00:00 2001
From: Daniel Gustafsson <daniel@yesql.se>
Date: Tue, 4 Dec 2018 17:52:41 +0100
Subject: [PATCH 1/2] Fix user facing typos

---
 pgweb/account/oauthclient.py                          | 2 +-
 templates/errors/csrf_failure.html                    | 2 +-
 templates/pages/about/policies/coc/_translations.html | 2 +-
 templates/pages/developer/summerofcode2011.html       | 2 +-
 templates/pages/developer/summerofcode2012.html       | 2 +-
 templates/pages/developer/summerofcode2013.html       | 2 +-
 templates/pages/developer/summerofcode2014.html       | 2 +-
 templates/pages/developer/summerofcode2016.html       | 2 +-
 templates/pages/download/linux/linux_openscg.inc      | 2 +-
 templates/pages/support/security/faq/2013-04-04.html  | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/pgweb/account/oauthclient.py b/pgweb/account/oauthclient.py
index 67dc4d9..194bf2e 100644
--- a/pgweb/account/oauthclient.py
+++ b/pgweb/account/oauthclient.py
@@ -195,4 +195,4 @@ def login_oauth(request, provider):
 			return HttpResponse(e)
 		except Exception, e:
 			log.error('Excpetion during OAuth: %s' % e)
-			return HttpResponse('An unhandled exception occured during the authentication process')
+			return HttpResponse('An unhandled exception occurred during the authentication process')
diff --git a/templates/errors/csrf_failure.html b/templates/errors/csrf_failure.html
index 3dd65ad..9b7eceb 100644
--- a/templates/errors/csrf_failure.html
+++ b/templates/errors/csrf_failure.html
@@ -9,7 +9,7 @@ inject data, or by your system not being configured to allow validation
 of the request.
 </p>
 <p>
-The most common reason for tihs error is that your browser
+The most common reason for this error is that your browser
 <strong>does not allow cookies</strong> on this request. Cookies are required for the
 cross site protection to work.
 </p>
diff --git a/templates/pages/about/policies/coc/_translations.html b/templates/pages/about/policies/coc/_translations.html
index ff74f8a..885a708 100644
--- a/templates/pages/about/policies/coc/_translations.html
+++ b/templates/pages/about/policies/coc/_translations.html
@@ -1,6 +1,6 @@
 <h1>Translations of the Code of Conduct</h1>
 <p>The Code of Conduct has been translated into multiple languages. Each
-  translation was verified independently by at least one aditional party.</p>
+  translation was verified independently by at least one additional party.</p>
 <p>If there are any discrepancies in language between a translation and the
     <a href="/about/policies/coc/">Code of Conduct written in English</a>, the
     English language Code of Conduct will take precedence.</p>
diff --git a/templates/pages/developer/summerofcode2011.html b/templates/pages/developer/summerofcode2011.html
index b6750b6..d0afdc5 100644
--- a/templates/pages/developer/summerofcode2011.html
+++ b/templates/pages/developer/summerofcode2011.html
@@ -25,7 +25,7 @@ href="http://socghop.appspot.com/">Summer of Code 2011</a> program. This program
 <p>The PostgreSQL Project has a wide range of opinions on what it feels are acceptable GSoC projects. The examples listed here are meant only as a suggestion of things we would likely find useful, but you should not feel obligated to pick from this list by any means. If you have just discovered a new algorithm as part of your thesis work, we would love to see a proposal implementing that in PostgreSQL. The point is that all proposals will be evaluated on their own merits, so be creative.
 
 <ul>
-<li><strong>TODO Items</strong>: A number of the items on our TODO list have been marked as good projects for beginners who are new to the PostgreSQL code. Items on this list have the advantage of already having general community agreement that the feature is desireable. These items should also have some general discussion available in the mailing list archives to help get you started. You can find these items on the <a href="https://wiki.postgresql.org/wiki/Todo">TODO</a> list, they will be marked with an [E].
+<li><strong>TODO Items</strong>: A number of the items on our TODO list have been marked as good projects for beginners who are new to the PostgreSQL code. Items on this list have the advantage of already having general community agreement that the feature is desirable. These items should also have some general discussion available in the mailing list archives to help get you started. You can find these items on the <a href="https://wiki.postgresql.org/wiki/Todo">TODO</a> list, they will be marked with an [E].
 </li>
 <li><strong>Other Ideas</strong>: are given on our <a href="https://wiki.postgresql.org/wiki/GSoC_2011#Project_Ideas">GSOC2011 Wiki Page</a></li>
 
diff --git a/templates/pages/developer/summerofcode2012.html b/templates/pages/developer/summerofcode2012.html
index 295cfd7..354fdcf 100644
--- a/templates/pages/developer/summerofcode2012.html
+++ b/templates/pages/developer/summerofcode2012.html
@@ -25,7 +25,7 @@ href="http://socghop.appspot.com/">Summer of Code 2012</a> program. This program
 <p>The PostgreSQL Project has a wide range of opinions on what it feels are acceptable GSoC projects. The examples listed here are meant only as a suggestion of things we would likely find useful, but you should not feel obligated to pick from this list by any means. If you have just discovered a new algorithm as part of your thesis work, we would love to see a proposal implementing that in PostgreSQL. The point is that all proposals will be evaluated on their own merits, so be creative.
 
 <ul>
-<li><strong>TODO Items</strong>: A number of the items on our TODO list have been marked as good projects for beginners who are new to the PostgreSQL code. Items on this list have the advantage of already having general community agreement that the feature is desireable. These items should also have some general discussion available in the mailing list archives to help get you started. You can find these items on the <a href="https://wiki.postgresql.org/wiki/Todo">TODO</a> list, they will be marked with an [E].
+<li><strong>TODO Items</strong>: A number of the items on our TODO list have been marked as good projects for beginners who are new to the PostgreSQL code. Items on this list have the advantage of already having general community agreement that the feature is desirable. These items should also have some general discussion available in the mailing list archives to help get you started. You can find these items on the <a href="https://wiki.postgresql.org/wiki/Todo">TODO</a> list, they will be marked with an [E].
 </li>
 <li><strong>Other Ideas</strong>: are given on our <a href="https://wiki.postgresql.org/wiki/GSoC_2012#Project_Ideas">GSOC2012 Wiki Page</a></li>
 </ul>
diff --git a/templates/pages/developer/summerofcode2013.html b/templates/pages/developer/summerofcode2013.html
index 5c78023..7195ec5 100644
--- a/templates/pages/developer/summerofcode2013.html
+++ b/templates/pages/developer/summerofcode2013.html
@@ -25,7 +25,7 @@ href="http://www.google-melange.com/">Summer of Code 2013</a> program. This prog
 <p>The PostgreSQL Project has a wide range of opinions on what it feels are acceptable GSoC projects. The examples listed here are meant only as a suggestion of things we would likely find useful, but you should not feel obligated to pick from this list by any means. If you have just discovered a new algorithm as part of your thesis work, we would love to see a proposal implementing that in PostgreSQL. The point is that all proposals will be evaluated on their own merits, so be creative.
 
 <ul>
-<li><strong>TODO Items</strong>: A number of the items on our TODO list have been marked as good projects for beginners who are new to the PostgreSQL code. Items on this list have the advantage of already having general community agreement that the feature is desireable. These items should also have some general discussion available in the mailing list archives to help get you started. You can find these items on the <a href="https://wiki.postgresql.org/wiki/Todo">TODO</a> list, they will be marked with an [E].
+<li><strong>TODO Items</strong>: A number of the items on our TODO list have been marked as good projects for beginners who are new to the PostgreSQL code. Items on this list have the advantage of already having general community agreement that the feature is desirable. These items should also have some general discussion available in the mailing list archives to help get you started. You can find these items on the <a href="https://wiki.postgresql.org/wiki/Todo">TODO</a> list, they will be marked with an [E].
 </li>
 <li><strong>Other Ideas</strong>: are given on our <a href="https://wiki.postgresql.org/wiki/GSoC_2013#Project_Ideas">GSOC2013 Wiki Page</a></li>
 
diff --git a/templates/pages/developer/summerofcode2014.html b/templates/pages/developer/summerofcode2014.html
index 3c0fb91..e63e558 100644
--- a/templates/pages/developer/summerofcode2014.html
+++ b/templates/pages/developer/summerofcode2014.html
@@ -25,7 +25,7 @@ href="http://www.google-melange.com/">Summer of Code 2014</a> program. This prog
 <p>The PostgreSQL Project has a wide range of opinions on what it feels are acceptable GSoC projects. The examples listed here are meant only as a suggestion of things we would likely find useful, but you should not feel obligated to pick from this list by any means. If you have just discovered a new algorithm as part of your thesis work, we would love to see a proposal implementing that in PostgreSQL. The point is that all proposals will be evaluated on their own merits, so be creative.
 
 <ul>
-<li><strong>TODO Items</strong>: A number of the items on our TODO list have been marked as good projects for beginners who are new to the PostgreSQL code. Items on this list have the advantage of already having general community agreement that the feature is desireable. These items should also have some general discussion available in the mailing list archives to help get you started. You can find these items on the <a href="https://wiki.postgresql.org/wiki/Todo">TODO</a> list, they will be marked with an [E].
+<li><strong>TODO Items</strong>: A number of the items on our TODO list have been marked as good projects for beginners who are new to the PostgreSQL code. Items on this list have the advantage of already having general community agreement that the feature is desirable. These items should also have some general discussion available in the mailing list archives to help get you started. You can find these items on the <a href="https://wiki.postgresql.org/wiki/Todo">TODO</a> list, they will be marked with an [E].
 </li>
 <li><strong>Other Ideas</strong>: are given on our <a href="https://wiki.postgresql.org/wiki/GSoC_2014#Project_Ideas">GSoC 2014 Wiki Page</a></li>
 
diff --git a/templates/pages/developer/summerofcode2016.html b/templates/pages/developer/summerofcode2016.html
index 88e1427..69e29e8 100644
--- a/templates/pages/developer/summerofcode2016.html
+++ b/templates/pages/developer/summerofcode2016.html
@@ -36,7 +36,7 @@ evaluated on their own merits, so be creative.
 <li><strong>TODO Items</strong>: A number of the items on our TODO list have
 been marked as good projects for beginners who are new to the PostgreSQL code.
 Items on this list have the advantage of already having general community
-agreement that the feature is desireable. These items should also have some
+agreement that the feature is desirable. These items should also have some
 general discussion available in the mailing list archives to help get you
 started. You can find these items on the
 <a href="https://wiki.postgresql.org/wiki/Todo">TODO</a> list, they will be
diff --git a/templates/pages/download/linux/linux_openscg.inc b/templates/pages/download/linux/linux_openscg.inc
index 1ede80d..7e69e06 100644
--- a/templates/pages/download/linux/linux_openscg.inc
+++ b/templates/pages/download/linux/linux_openscg.inc
@@ -1,7 +1,7 @@
 <h2>Cross distribution packages</h2>
 <p>
 Generic RPM and DEB packages that provide a server-only distribution
-are avaliable for some 32 and 64-bit Linux distributions.  These
+are available for some 32 and 64-bit Linux distributions.  These
 packages provide a single set of binaries and consistent packaging
 across different Linux distributions.  They are designed for server
 installation where a GUI is not available and consistency across
diff --git a/templates/pages/support/security/faq/2013-04-04.html b/templates/pages/support/security/faq/2013-04-04.html
index 835c7c6..a097c4f 100644
--- a/templates/pages/support/security/faq/2013-04-04.html
+++ b/templates/pages/support/security/faq/2013-04-04.html
@@ -87,7 +87,7 @@ to the public (such as RPMs and Windows installers) early access to be able to
 release information and code so that packages can be ready on the official
 release date. This applied to both minor and major releases. Given the
 increasing prevalence of PostgreSQL-as-a-Service (PGaaS) as a distribution
-mechanism, we are revising this policy to accomodate the case of the cloud
+mechanism, we are revising this policy to accommodate the case of the cloud
 providers. The new policy is still being edited and should be available soon.
 </p>
 
-- 
2.14.1.145.gb3622a4ee

