From b2ffced2b07c96ceaf154c8a8ffde0d004cbc1b7 Mon Sep 17 00:00:00 2001 From: Magnus Hagander Date: Mon, 31 Aug 2020 11:56:33 +0200 Subject: [PATCH] Update more links to be https instead of http --- README.rst | 8 +- media/js/showdown_preview.js | 2 +- pgweb/settings.py | 2 +- templates/core/community.html | 2 +- templates/pages/about/donate.html | 2 +- templates/pages/about/donate_pg_org.html | 4 +- templates/pages/about/licence.html | 2 +- .../about/policies/planet-postgresql.html | 2 +- .../pages/about/policies/trademarks.html | 2 +- templates/pages/community/international.html | 14 ++-- templates/pages/developer/coding.html | 2 +- .../pages/developer/related-projects.html | 2 +- templates/pages/developer/summerofcode.html | 6 +- templates/pages/docs/books.html | 74 +++++++++---------- templates/pages/docs/online-resources.html | 6 +- templates/pages/download.html | 2 +- templates/pages/download/freebsd.html | 4 +- templates/pages/download/linux/debian.html | 4 +- templates/pages/download/linux/suse.html | 2 +- templates/pages/download/macosx.html | 12 +-- templates/pages/download/openbsd.html | 2 +- templates/pages/download/snapshots.html | 4 +- .../support/security/faq/2013-04-04.html | 2 +- 23 files changed, 81 insertions(+), 81 deletions(-) diff --git a/README.rst b/README.rst index 9c3fc8e4..33351a34 100644 --- a/README.rst +++ b/README.rst @@ -8,9 +8,9 @@ free to be mirrored anywhere. Technology ---------- -The website code is written in `Python `_ using -the `Django `_ framework. Not surprisingly, -`PostgreSQL `_ is used as the database. Further details +The website code is written in `Python `_ using +the `Django `_ framework. Not surprisingly, +`PostgreSQL `_ is used as the database. Further details about the code and technology can be found in the different documents in the docs directory. @@ -33,7 +33,7 @@ want to make any major changes, be sure to have discussed those on the list firs Licence ------- The code for the website is licensed under -`The PostgreSQL Licence `_, which is +`The PostgreSQL Licence `_, which is closely related to the BSD licence. Django is released under its `BSD Licence `_. diff --git a/media/js/showdown_preview.js b/media/js/showdown_preview.js index 7a43d163..c33996f0 100644 --- a/media/js/showdown_preview.js +++ b/media/js/showdown_preview.js @@ -29,7 +29,7 @@ function attach_showdown_preview(objid, admin) { obj.parentNode.insertBefore(newdiv, obj.nextSibling); - obj.infospan_html_base = admin ? '' : 'This field supports markdown. See below for a preview.'; + obj.infospan_html_base = admin ? '' : 'This field supports markdown. See below for a preview.'; obj.infospan = document.createElement('span'); obj.infospan.innerHTML = obj.infospan_html_base; diff --git a/pgweb/settings.py b/pgweb/settings.py index f8b7e19f..d17f0d62 100644 --- a/pgweb/settings.py +++ b/pgweb/settings.py @@ -139,7 +139,7 @@ CSRF_COOKIE_SECURE = SESSION_COOKIE_SECURE CSRF_COOKIE_DOMAIN = SESSION_COOKIE_DOMAIN CSRF_COOKIE_HTTPONLY = SESSION_COOKIE_HTTPONLY -SITE_ROOT = "http://www.postgresql.org" # Root of working URLs +SITE_ROOT = "https://www.postgresql.org" # Root of working URLs FTP_PICKLE = "/usr/local/pgweb/ftpsite.pickle" # Location of file with current contents from ftp site YUM_JSON = "/usr/local/pgweb/external/yum.json" STATIC_CHECKOUT = "/usr/local/pgweb-static" # Location of a checked out pgweb-static project diff --git a/templates/core/community.html b/templates/core/community.html index 50459646..e934f80d 100644 --- a/templates/core/community.html +++ b/templates/core/community.html @@ -41,7 +41,7 @@

External Resources

Please send appropriate links to webmaster@postgresql.org for possible inclusion on this page. diff --git a/templates/pages/about/donate.html b/templates/pages/about/donate.html index 32ecd37e..652c8ac3 100644 --- a/templates/pages/about/donate.html +++ b/templates/pages/about/donate.html @@ -5,7 +5,7 @@

Donate

General PostgreSQL efforts

-

PostgreSQL is an affiliated project of Software in the Public Interest. Funds donated to PostgreSQL are used +

PostgreSQL is an affiliated project of Software in the Public Interest. Funds donated to PostgreSQL are used to sponsor general PostgreSQL efforts. These funds are managed by the Fund raising group.

Donate to PostgreSQL

diff --git a/templates/pages/about/donate_pg_org.html b/templates/pages/about/donate_pg_org.html index 5e2ee6c7..fd4bbe7b 100644 --- a/templates/pages/about/donate_pg_org.html +++ b/templates/pages/about/donate_pg_org.html @@ -9,7 +9,7 @@

Donate by Credit Card / PayPal

PostgreSQL donations are processed via Paysimple (third party) and deposited - into the PostgreSQL account at Software in the Public Interest (SPI). + into the PostgreSQL account at Software in the Public Interest (SPI). You can click the button below, which will redirect you to PayPal where your donation will be processed:

@@ -33,7 +33,7 @@ United States

Tax deductibility

-

Please be aware that PostgreSQL contributions may or may not be tax exempt. For more information please see the SPI website and your local tax advisor. If you would like to donate non-monetary items such as computers or other equipment, please contact the Please be aware that PostgreSQL contributions may or may not be tax exempt. For more information please see the SPI website and your local tax advisor. If you would like to donate non-monetary items such as computers or other equipment, please contact the PostgreSQL Funds Group.

Infrastructure Donations

diff --git a/templates/pages/about/licence.html b/templates/pages/about/licence.html index dd0ae093..5e13a7da 100644 --- a/templates/pages/about/licence.html +++ b/templates/pages/about/licence.html @@ -2,7 +2,7 @@ {%block title%}License{%endblock%} {%block contents%}

License

-

PostgreSQL is released under the PostgreSQL License, +

PostgreSQL is released under the PostgreSQL License, a liberal Open Source license, similar to the BSD or MIT licenses.

diff --git a/templates/pages/about/policies/planet-postgresql.html b/templates/pages/about/policies/planet-postgresql.html index 523f6d76..43ae3ca5 100644 --- a/templates/pages/about/policies/planet-postgresql.html +++ b/templates/pages/about/policies/planet-postgresql.html @@ -74,7 +74,7 @@ recommended.

What are the right URLs to use for a labeled feed from blogger.com?

+ href="https://www.blogger.com/">blogger.com?

Assuming your blog is named "blogname" and you've tagged a subset of your posts with the "postgresql" label, the correct URLs to input to the Planet code are:

diff --git a/templates/pages/about/policies/trademarks.html b/templates/pages/about/policies/trademarks.html index f4d8d6d6..daf3adb0 100644 --- a/templates/pages/about/policies/trademarks.html +++ b/templates/pages/about/policies/trademarks.html @@ -11,7 +11,7 @@

The PostgreSQL elephant logo (Slonik) and the names "PostgreSQL" and "Postgres" are registered - trademarks of the PostgreSQL Community + trademarks of the PostgreSQL Community Association of Canada. If you wish to use either name or logo in any way, you must comply with this policy.

diff --git a/templates/pages/community/international.html b/templates/pages/community/international.html index bf5881aa..47c22dc6 100644 --- a/templates/pages/community/international.html +++ b/templates/pages/community/international.html @@ -23,11 +23,11 @@ Simplified Chinese PostgreSQL Community - Chinese (Traditional) + Chinese (Traditional) Traditional Chinese PostgreSQL Community - Czech + Czech Informace o PostgreSQL v češtině @@ -39,7 +39,7 @@ La communaute Française de PostgreSQL - Israel + Israel The Israeli PostgreSQL Community @@ -47,15 +47,15 @@ Comunità italiana di PostgreSQL - Italiano + Italiano Associazione ITPUG - Japanese + Japanese The Japanese PostgreSQL Community - Korean + Korean The Korean PostgreSQL Community @@ -67,7 +67,7 @@ Сообщество русскоязычных пользователей PostgreSQL - Türkce + Türkce Türkiye PostgreSQL Kullanıcıları Grubu diff --git a/templates/pages/developer/coding.html b/templates/pages/developer/coding.html index cf483c33..594abbf4 100644 --- a/templates/pages/developer/coding.html +++ b/templates/pages/developer/coding.html @@ -10,7 +10,7 @@ For Buildfarm related discussions, use the buildfarm-members mailing list.

diff --git a/templates/pages/developer/summerofcode.html b/templates/pages/developer/summerofcode.html index bf56f8be..16333842 100644 --- a/templates/pages/developer/summerofcode.html +++ b/templates/pages/developer/summerofcode.html @@ -79,9 +79,9 @@ one of the Summer of Code liaisons below about writing a proposal.

| 2012 | 2011 | 2010 - | 2008 - | 2007 - | 2006)

+ | 2008 + | 2007 + | 2006)

diff --git a/templates/pages/docs/books.html b/templates/pages/docs/books.html index eebadca0..c83290c6 100644 --- a/templates/pages/docs/books.html +++ b/templates/pages/docs/books.html @@ -223,7 +223,7 @@ - PostgreSQL - Architecture et notions avancées @@ -238,7 +238,7 @@ - Mastering PostgreSQL In Application Development @@ -253,7 +253,7 @@ - PostgreSQL: Up and Running + PostgreSQL: Up and Running Title: PostgreSQL: Up and Running, 3rd Edition
@@ -331,7 +331,7 @@ - Working with PostgreSQL: configuration and scaling + Working with PostgreSQL: configuration and scaling Title: Working with PostgreSQL: configuration and scaling
@@ -361,7 +361,7 @@ - PL/pgSQL y otros lenguajes procedurales en PostgreSQL @@ -393,7 +393,7 @@ - PostgreSQL - Architecture et notions avancées @@ -537,7 +537,7 @@ - PostgreSQL Up & Running (2nd Edition) @@ -585,7 +585,7 @@ - Postgres Succinctly + Postgres Succinctly Title: Postgres Succinctly
@@ -599,7 +599,7 @@ - PostgreSQL Replication + PostgreSQL Replication Title: PostgreSQL Replication
@@ -613,7 +613,7 @@ - PostgreSQL Backup and Restore How-to + PostgreSQL Backup and Restore How-to Title: PostgreSQL Backup and Restore How-to
@@ -627,7 +627,7 @@ - Instant PostgreSQL Starter + Instant PostgreSQL Starter Title: Instant PostgreSQL Starter
@@ -641,7 +641,7 @@ - PostgreSQL Server Programming + PostgreSQL Server Programming Title: PostgreSQL Server Programming
@@ -654,7 +654,7 @@ - PostgreSQL: Up and Running + PostgreSQL: Up and Running Title: PostgreSQL: Up and Running
@@ -667,7 +667,7 @@ - Bases de données PostgreSQL, Gestion des performances + Bases de données PostgreSQL, Gestion des performances Title: Bases de données PostgreSQL, Gestion des performances
@@ -680,7 +680,7 @@ - PostgreSQL Reference Manual - Volume 1 + PostgreSQL Reference Manual - Volume 1 Title: PostgreSQL Reference Manual - Volume 1-3
@@ -746,7 +746,7 @@ - PostgreSQL. Datenbankpraxis für Anwender, Administratoren und Entwickler (Broschiert) + PostgreSQL. Datenbankpraxis für Anwender, Administratoren und Entwickler (Broschiert) Title: PostgreSQL. Datenbankpraxis für Anwender, Administratoren und Entwickler (Broschiert)
@@ -759,7 +759,7 @@ - PostgreSQL + PostgreSQL Title: PostgreSQL
@@ -772,7 +772,7 @@ - PostgreSQL-Administration + PostgreSQL-Administration Title: PostgreSQL-Administration
@@ -785,7 +785,7 @@ - PostgreSQL - Administration et exploitation d’une base de données (2ème édition) + PostgreSQL - Administration et exploitation d’une base de données (2ème édition) Title: PostgreSQL - Administration et exploitation d’une base de données (2ème édition)
@@ -798,7 +798,7 @@ - PostgreSQL 8 For Windows + PostgreSQL 8 For Windows Title: PostgreSQL 8 For Windows
@@ -811,7 +811,7 @@ - Cover of Beginning PHP and PostgreSQL E-Commerce + Cover of Beginning PHP and PostgreSQL E-Commerce Title: Beginning PHP and PostgreSQL E-Commerce
@@ -824,7 +824,7 @@ - Cover of PHP and PostgreSQL 8 + Cover of PHP and PostgreSQL 8 Title: Beginning PHP & PostgreSQL 8: From Novice to Professionnal
@@ -850,7 +850,7 @@ - Cover of PostgreSQL, 2nd Edition + Cover of PostgreSQL, 2nd Edition Title: PostgreSQL, 2nd Edition
@@ -863,7 +863,7 @@ - Cover of Beginning Databases with PostgreSQL, 2nd Edition + Cover of Beginning Databases with PostgreSQL, 2nd Edition Title: Beginning Databases with PostgreSQL, 2nd Edition
@@ -876,7 +876,7 @@ - Cover of PostgreSQL GE-PACKT + Cover of PostgreSQL GE-PACKT Title: PostgreSQL GE-PACKT
@@ -889,7 +889,7 @@ - Cover of PostgreSQL, m. CD-ROM + Cover of PostgreSQL, m. CD-ROM Title: PostgreSQL, m. CD-ROM
@@ -902,7 +902,7 @@ - Cover of PostgreSQL: Das offizielle Handbuch + Cover of PostgreSQL: Das offizielle Handbuch Title: PostgreSQL: Das offizielle Handbuch
@@ -916,7 +916,7 @@ - Cover of PostgreSQL. Grundlagen - Praxis - Anwendungsentwicklung mit PHP + Cover of PostgreSQL. Grundlagen - Praxis - Anwendungsentwicklung mit PHP Title: PostgreSQL. Grundlagen - Praxis - Anwendungsentwicklung mit PHP.
@@ -929,7 +929,7 @@ - Cover of PHP and PostgreSQL Advanced Web Programming + Cover of PHP and PostgreSQL Advanced Web Programming Title: PHP and PostgreSQL Advanced Web Programming
@@ -942,7 +942,7 @@ - Cover of Practical PostgreSQL + Cover of Practical PostgreSQL Title: Practical PostgreSQL (O'Reilly Unix)
@@ -951,12 +951,12 @@ Current version at publication: <7.4
Format: Paperback
Published: January 2002 - Available online
+ Available online
- Cover of Postgresql Developer's Handbook + Cover of Postgresql Developer's Handbook Title: Postgresql Developer's Handbook
@@ -969,7 +969,7 @@ - Cover of PostgreSQL + Cover of PostgreSQL Title: PostgreSQL
@@ -982,7 +982,7 @@ - Cover of PostgreSQL Essential Reference + Cover of PostgreSQL Essential Reference Title: PostgreSQL Essential Reference
@@ -995,7 +995,7 @@ - Cover of Beginning Databases with PostgreSQL + Cover of Beginning Databases with PostgreSQL Title: Beginning Databases with PostgreSQL
@@ -1008,7 +1008,7 @@ - Cover of PostgreSQL: Introduction and Concepts + Cover of PostgreSQL: Introduction and Concepts Title: PostgreSQL: Introduction and Concepts
@@ -1021,7 +1021,7 @@ - Cover of Postgresql Programmer's Guide + Cover of Postgresql Programmer's Guide Title: Postgresql Programmer's Guide
diff --git a/templates/pages/docs/online-resources.html b/templates/pages/docs/online-resources.html index 50f6cf62..9d7fb10f 100644 --- a/templates/pages/docs/online-resources.html +++ b/templates/pages/docs/online-resources.html @@ -14,13 +14,13 @@ - PostgreSQL Tutorial + PostgreSQL Tutorial Learn PostgreSQL and how to get started quickly through practical examples. - Tutorials Point PostgreSQL + Tutorials Point PostgreSQL A full, free online course for walking through PostgreSQL, from the basics to advanced administration. @@ -38,7 +38,7 @@ - Schemaverse + Schemaverse A space-based strategy game implemented entirely within a PostgreSQL database. diff --git a/templates/pages/download.html b/templates/pages/download.html index 736be365..f1d96633 100644 --- a/templates/pages/download.html +++ b/templates/pages/download.html @@ -124,7 +124,7 @@ tools such as HBase, Hive, Pig, DataFu, Flume, Sqoop and others.

'LAPP', 'MAPP' and 'WAPP' (Linux/Mac/Windows + Apache + PHP + PostgreSQL) stacks are available from -BitNami. +BitNami.

Additional Software

diff --git a/templates/pages/download/freebsd.html b/templates/pages/download/freebsd.html index 566c47ce..3e2a9319 100644 --- a/templates/pages/download/freebsd.html +++ b/templates/pages/download/freebsd.html @@ -6,11 +6,11 @@

FreeBSD Ports

-

PostgreSQL packages are available for FreeBSD from the FreeBSD +

PostgreSQL packages are available for FreeBSD from the FreeBSD Ports and Packages Collection. Please see the ports documentation for information on how to install ports.

-

A list of PostgreSQL +

A list of PostgreSQL packages can be found using the Ports Search tool on the FreeBSD website.

{%endblock%} diff --git a/templates/pages/download/linux/debian.html b/templates/pages/download/linux/debian.html index fa6e2a71..8a4424a2 100644 --- a/templates/pages/download/linux/debian.html +++ b/templates/pages/download/linux/debian.html @@ -112,10 +112,10 @@ version number as required):

Debian backports

Newer versions of PostgreSQL for older versions of Debians are available -in Debian backports. For +in Debian backports. For information on how to enable and use the backports repository, please see the -backports instructions page at Debian. +backports instructions page at Debian.

Once backports is enabled, you can install PostgreSQL the same way as with diff --git a/templates/pages/download/linux/suse.html b/templates/pages/download/linux/suse.html index d3151b9c..ccb598ac 100644 --- a/templates/pages/download/linux/suse.html +++ b/templates/pages/download/linux/suse.html @@ -28,7 +28,7 @@ RPMs for SUSE Linux and openSUSE are available from the in the project server:database:postgresql. Platform-specific RPM packages are available for PostgreSQL as well as a variety of related software. -Use the search facility +Use the search facility to find suitable packages. Documentation is also available there.

diff --git a/templates/pages/download/macosx.html b/templates/pages/download/macosx.html index 2f14dcea..3e780877 100644 --- a/templates/pages/download/macosx.html +++ b/templates/pages/download/macosx.html @@ -106,7 +106,7 @@ and procedural languages (Python, Perl, Java, and TCL).

Postgres.app

-Postgres.app is a simple, native macOS app that runs in the menubar without the need of an installer. Open the app, and you have a PostgreSQL server +Postgres.app is a simple, native macOS app that runs in the menubar without the need of an installer. Open the app, and you have a PostgreSQL server ready and awaiting new connections. Close the app, and the server shuts down.

@@ -114,13 +114,13 @@ ready and awaiting new connections. Close the app, and the server shuts down.

PostgreSQL packages are available for macOS from the -Fink Project. +Fink Project. Please see the Fink documentation for information on how to install packages.

A list of -PostgreSQL packages +PostgreSQL packages can be found using the package search tool on the Fink website.

@@ -128,13 +128,13 @@ can be found using the package search tool on the Fink website.

PostgreSQL packages are also available for macOS from the -MacPorts Project. Please see the +MacPorts Project. Please see the MacPorts documentation for information on how to install ports.

A list of -PostgreSQL packages +PostgreSQL packages can be found using the portfiles search tool on the MacPorts website.

@@ -142,7 +142,7 @@ can be found using the portfiles search tool on the MacPorts website.

PostgreSQL can also be installed on macOS -using Homebrew. Please see the Homebrew +using Homebrew. Please see the Homebrew documentation for information on how to install packages.

diff --git a/templates/pages/download/openbsd.html b/templates/pages/download/openbsd.html index 5bf92916..ab667319 100644 --- a/templates/pages/download/openbsd.html +++ b/templates/pages/download/openbsd.html @@ -6,7 +6,7 @@

OpenBSD Ports

-

PostgreSQL packages are available for OpenBSD from the OpenBSD +

PostgreSQL packages are available for OpenBSD from the OpenBSD Ports and Packages Collection. Please see the ports documentation for information on how to install ports.

diff --git a/templates/pages/download/snapshots.html b/templates/pages/download/snapshots.html index cf6a7472..55764f00 100644 --- a/templates/pages/download/snapshots.html +++ b/templates/pages/download/snapshots.html @@ -43,7 +43,7 @@ all bugfixes that are scheduled for the next release.

Installers

Installers for Windows and Mac are available +href="https://www.enterprisedb.com/products-services-training/pgdevdownload"> here (offsite link). These installers also include pgAdmin and are published by EDB.

@@ -51,7 +51,7 @@ published by EDB.

Red Hat, CentOS, Fedora and Scientific Linux

RPMs for Red Hat, CentOS, Fedora and Scientific Linux are available from the -PostgreSQL Yum repository. +PostgreSQL Yum repository.

To setup the repository for these versions, follow the same instructions diff --git a/templates/pages/support/security/faq/2013-04-04.html b/templates/pages/support/security/faq/2013-04-04.html index a097c4fe..bfa6c63f 100644 --- a/templates/pages/support/security/faq/2013-04-04.html +++ b/templates/pages/support/security/faq/2013-04-04.html @@ -15,7 +15,7 @@

While this FAQ covers the 2013-04-04 PostgreSQL Security Update in general, most of its contents focus on the primary security vulnerability patched in the -release, +release, CVE-2013-1899.

Are there any known exploits "in the wild" for this vulnerability?

-- 2.39.5