From ebfff4f2c547aed6badade0d60da513014f0952a Mon Sep 17 00:00:00 2001 From: "Jonathan S. Katz" Date: Sun, 15 Apr 2018 15:01:46 -0400 Subject: [PATCH] Replace and tags with and respectively. The semantics of and tags have changed as the web has evolved. is specified to only be used as a last resort whereas can be used for other purposes (e.g. rendering icons). Bold and italic text should be rendered using and respectively. This patch makes this replacement in all pages except for pages that will be deprecrated soon and in the presskits. --- pgweb/search/views.py | 2 +- templates/account/emailchangecompleted.html | 2 +- templates/account/objectlist.html | 2 +- templates/account/orglist.html | 2 +- templates/account/userprofileform.html | 2 +- templates/admin/base_site.html | 2 +- templates/admin/change_form_pgweb.html | 4 +- templates/docs/docspage.html | 8 ++-- templates/downloads/mirrorselect.html | 6 +-- templates/downloads/productlist.html | 4 +- templates/errors/csrf_failure.html | 4 +- templates/events/archive.html | 10 ++--- templates/events/item.html | 10 ++--- templates/index.html | 8 ++-- templates/misc/bug_header.html | 4 +- templates/news/item.html | 6 +-- templates/news/newsarchive.html | 2 +- templates/pages/about.html | 2 +- templates/pages/about/advantages.html | 2 +- templates/pages/about/awards.html | 20 +++++----- templates/pages/about/press/faq.html | 38 +++++++++---------- templates/pages/developer/backend.html | 24 ++++++------ templates/pages/developer/roadmap.html | 2 +- .../pages/developer/summerofcodeadvice.html | 4 +- templates/pages/docs/books.html | 2 +- templates/pages/download.html | 4 +- templates/pages/download/linux.html | 2 +- templates/pages/download/linux/debian.html | 4 +- .../pages/download/linux/linux_oneclick.inc | 2 +- .../pages/download/linux/linux_openscg.inc | 2 +- templates/pages/download/linux/redhat.html | 4 +- templates/pages/download/linux/suse.html | 2 +- templates/pages/download/linux/ubuntu.html | 4 +- templates/pages/download/snapshots.html | 2 +- .../support/security/faq/2013-04-04.html | 4 +- templates/profserv/list.html | 2 +- templates/search/listsearch.html | 2 +- templates/search/sitesearch.html | 2 +- templates/support/versioning.html | 6 +-- templates/survey/results.html | 4 +- 40 files changed, 109 insertions(+), 109 deletions(-) diff --git a/pgweb/search/views.py b/pgweb/search/views.py index 29c39e1a..b69353cc 100644 --- a/pgweb/search/views.py +++ b/pgweb/search/views.py @@ -309,6 +309,6 @@ def search(request): 'hits': [{ 'title': h[3], 'url': "%s%s" % (h[1], h[2]), - 'abstract': h[4].replace("[[[[[[", "").replace("]]]]]]",""), + 'abstract': h[4].replace("[[[[[[", "").replace("]]]]]]",""), 'rank': h[5]} for h in hits[:-1]], }) diff --git a/templates/account/emailchangecompleted.html b/templates/account/emailchangecompleted.html index 3cf357cc..49ce898d 100644 --- a/templates/account/emailchangecompleted.html +++ b/templates/account/emailchangecompleted.html @@ -9,7 +9,7 @@ Your email has successfully been changed to {{user.email}}.

Please note that if you are using your account from a different -community site than www.postgresql.org, you may need to log +community site than www.postgresql.org, you may need to log out and back in again for the email to be updated on that site.

{%else%} diff --git a/templates/account/objectlist.html b/templates/account/objectlist.html index 1839b063..a975ca13 100644 --- a/templates/account/objectlist.html +++ b/templates/account/objectlist.html @@ -4,7 +4,7 @@

{{title}}s

Objects in red are awaiting moderator approval. Note that modifying a previously -approved object may result in it being un-approved if the changes are +approved object may result in it being un-approved if the changes are extensive.

    diff --git a/templates/account/orglist.html b/templates/account/orglist.html index 4cbd078d..9781e2b1 100644 --- a/templates/account/orglist.html +++ b/templates/account/orglist.html @@ -4,7 +4,7 @@

    Organisations

    The following organisations are registered in our database. Note that any -organisations listed as Migrated Connections are organisations that +organisations listed as Migrated Connections are organisations that have been migrated from our old website and not been given a proper manager in the new system. If you are the manager of one of these organisations, please send an email to diff --git a/templates/account/userprofileform.html b/templates/account/userprofileform.html index d1e77f3d..74fd334f 100644 --- a/templates/account/userprofileform.html +++ b/templates/account/userprofileform.html @@ -16,7 +16,7 @@ Email - {{user.email}} {%if can_change_email%}(change){%else%} + {{user.email}} {%if can_change_email%}(change){%else%}

    The email address of this account cannot be changed, because the account does not have a local password, most likely because it's connected to a third diff --git a/templates/admin/base_site.html b/templates/admin/base_site.html index bf781941..b69768ed 100644 --- a/templates/admin/base_site.html +++ b/templates/admin/base_site.html @@ -1,5 +1,5 @@ {%extends "admin/base.html"%} -{%block branding%}Welcome to the PostgreSQL website administration site | Pending moderation | Purge from frontend{%endblock%} +{%block branding%}Welcome to the PostgreSQL website administration site | Pending moderation | Purge from frontend{%endblock%} {%block extrahead%} diff --git a/templates/admin/change_form_pgweb.html b/templates/admin/change_form_pgweb.html index 4ca5bbe5..e458fb96 100644 --- a/templates/admin/change_form_pgweb.html +++ b/templates/admin/change_form_pgweb.html @@ -35,11 +35,11 @@ Note that the summary field can use

{%if original.org.email%} -New notification: (Note! This comment is emailed to the organisation!)
+New notification: (Note! This comment is emailed to the organisation!)
To send a notification on rejection, first add the notification above and hit "Save and continue editing". Then as a separate step, delete the record. {%else%} -Organisation has no email, so cannot send notifications to it! +Organisation has no email, so cannot send notifications to it! {%endif%}

diff --git a/templates/docs/docspage.html b/templates/docs/docspage.html index ca2bd174..e2da903d 100644 --- a/templates/docs/docspage.html +++ b/templates/docs/docspage.html @@ -43,14 +43,14 @@ This page in other versions: {%if not forloop.first %}/{%endif%} {%if ver.version.current %} {%if ver.version == page.version %} - current ({{ver.display_version}}) + current ({{ver.display_version}}) {%else%} current ({{ver.display_version}}) {%endif%} {%else%} {%if ver.version == page.version %} - {{ver.display_version}} + {{ver.display_version}} {%else%} {{ver.display_version}} {%endif%} @@ -63,7 +63,7 @@ This page in other versions: {%for ver in devel_versions %} {%if not forloop.first %}/{%endif%} {%if ver.version == page.version %} - {{ver.display_version}} + {{ver.display_version}} {% else %} {{ver.display_version}} {%endif%} @@ -75,7 +75,7 @@ This page in other versions: {%for ver in unsupported_versions %} {%if not forloop.first %}/{%endif%} {%if ver.version == page.version %} - {{ver.display_version}} + {{ver.display_version}} {% else %} {{ver.display_version}} {%endif%} diff --git a/templates/downloads/mirrorselect.html b/templates/downloads/mirrorselect.html index 68307ecb..ad9366f4 100644 --- a/templates/downloads/mirrorselect.html +++ b/templates/downloads/mirrorselect.html @@ -13,11 +13,11 @@ div.mirrorselect { {%endblock%} {%block contents%}

Choose a download mirror

-

Downloading: {{path}}

+

Downloading: {{path}}

{%if near_mirrors%} -

We think these mirrors are near you:

+

We think these mirrors are near you:

{%for mirror in near_mirrors%} {%include "downloads/inc_mirror.html"%} @@ -25,7 +25,7 @@ div.mirrorselect {
{%endif%} -

Choose any other mirror in the world:

+

Choose any other mirror in the world:

{%for mirror in all_mirrors%} {%include "downloads/inc_mirror.html"%} diff --git a/templates/downloads/productlist.html b/templates/downloads/productlist.html index 662d4714..61defeb0 100644 --- a/templates/downloads/productlist.html +++ b/templates/downloads/productlist.html @@ -38,8 +38,8 @@ {%endfor%} -

Note: The PostgreSQL Global Development Group do not endorse or +

Note: The PostgreSQL Global Development Group do not endorse or recommend any products listed, and cannot vouch for the quality or reliability -of any of them.

+of any of them.

{%endblock%} diff --git a/templates/errors/csrf_failure.html b/templates/errors/csrf_failure.html index 2c7c1621..3dd65ad5 100644 --- a/templates/errors/csrf_failure.html +++ b/templates/errors/csrf_failure.html @@ -10,10 +10,10 @@ of the request.

The most common reason for tihs error is that your browser -does not allow cookies on this request. Cookies are required for the +does not allow cookies on this request. Cookies are required for the cross site protection to work.

-The internal reason given was: {{reason}} +The internal reason given was: {{reason}}

{%endblock%} diff --git a/templates/events/archive.html b/templates/events/archive.html index ebc03e65..5af79496 100644 --- a/templates/events/archive.html +++ b/templates/events/archive.html @@ -7,15 +7,15 @@ {%for eventblock in eventblocks%} {%if eventblocks|length > 1%}

{{eventblock.name}}

{%endif%}

-Note: The PostgreSQL Global Development Group does not endorse any +Note: The PostgreSQL Global Development Group does not endorse any events run by third parties. No guarantee of the quality of events is offered -whatsoever. For information on Community Conference Recognition, please review the guidelines here. +whatsoever. For information on Community Conference Recognition, please review the guidelines here.

{%for event in eventblock.events %} -
Date: {{event.displaydate|safe}}
-
Location: {{event.locationstring}}
-{%if event.language%}
Language: {{event.language}}
{%endif%} +
Date: {{event.displaydate|safe}}
+
Location: {{event.locationstring}}
+{%if event.language%}
Language: {{event.language}}
{%endif%}
{{event.summary|markdown}}
diff --git a/templates/events/item.html b/templates/events/item.html index 507daa63..c4ab8cde 100644 --- a/templates/events/item.html +++ b/templates/events/item.html @@ -3,19 +3,19 @@ {%block title%}{{obj.title}}{%endblock%} {%block contents%}

{{obj.title}}

-
Date: {{obj.displaydate|safe}}
+
Date: {{obj.displaydate|safe}}
Location: {{obj.locationstring}}
{%if obj.language%}
Language: {{obj.language}}
{%endif%} {{obj.details|markdown}} {%if obj.has_organisation%}

Posted by {{obj.org}}{%if obj.org.email%} ({{obj.org.email}}){%endif%}.

{%else%} -

This event has been migrated from a previous version of the PostgreSQL -website. We apologise for any formatting issues caused by the migration.

+

This event has been migrated from a previous version of the PostgreSQL +website. We apologise for any formatting issues caused by the migration.

{%endif%}

-Note: The PostgreSQL Global Development Group does not endorse any +Note: The PostgreSQL Global Development Group does not endorse any events run by third parties. No guarantee of the quality of events is offered -whatsoever. +whatsoever.

{%endblock%} diff --git a/templates/index.html b/templates/index.html index 7d48f2c9..d254819d 100644 --- a/templates/index.html +++ b/templates/index.html @@ -9,7 +9,7 @@
-

1st March 2018

+

1st March 2018

PostgreSQL 10.3 Released! @@ -38,7 +38,7 @@

>  Featured User

{{quote.quote}}
-
{{quote.who}}, {{quote.org}}
+
{{quote.who}}, {{quote.org}}
@@ -54,11 +54,11 @@

>  Latest Releases

{%for v in versions %} - {{v.numtree}}.{{v.latestminor}} · {{v.reldate}} · Notes + {{v.numtree}}.{{v.latestminor}} · {{v.reldate}} · Notes
{%endfor%}
- +

>  Shortcuts

diff --git a/templates/misc/bug_header.html b/templates/misc/bug_header.html index cb44ec4d..6e05be86 100644 --- a/templates/misc/bug_header.html +++ b/templates/misc/bug_header.html @@ -38,7 +38,7 @@ appropriate mailing list available.

By submitting a bug through this form you agree that all contents of the bug report, -including your personal information as listed, will be posted to the public +including your personal information as listed, will be posted to the public pgsql-bugs mailing list, and archived in the -public list archives. +public list archives.

diff --git a/templates/news/item.html b/templates/news/item.html index fbb71000..6bcc6d27 100644 --- a/templates/news/item.html +++ b/templates/news/item.html @@ -3,11 +3,11 @@ {%block title%}{{obj.title}}{%endblock%} {%block contents%}

{{obj.title}}

-
Posted on {{obj.displaydate}}
+
Posted on {{obj.displaydate}}
{{obj.content|markdown}} {%if obj.is_migrated%} -

This post has been migrated from a previous version of the PostgreSQL -website. We apologise for any formatting issues caused by the migration.

+

This post has been migrated from a previous version of the PostgreSQL +website. We apologise for any formatting issues caused by the migration.

{%endif%} {%for t in obj.tags.all%} {{t.name}} diff --git a/templates/news/newsarchive.html b/templates/news/newsarchive.html index 1ac52af5..c4bc12ea 100644 --- a/templates/news/newsarchive.html +++ b/templates/news/newsarchive.html @@ -10,7 +10,7 @@ {%for obj in news %}

{{obj.title}}

-
Posted on {{obj.displaydate}}
+
Posted on {{obj.displaydate}}
{{obj.content|markdown|striptags|truncatewords:20}} {%endfor%}

Submit news

diff --git a/templates/pages/about.html b/templates/pages/about.html index adc7f66b..c9f2a895 100644 --- a/templates/pages/about.html +++ b/templates/pages/about.html @@ -24,7 +24,7 @@ case-sensitivity, and formatting. It is highly scalable both in the sheer quanti of data it can manage and in the number of concurrent users it can accommodate. There are active PostgreSQL instances in production environments that manage many terabytes of data, as well as clusters managing petabytes. Some general PostgreSQL limits are -included in the table below.

LimitValue
Maximum Database SizeUnlimited
Maximum Table Size32 TB
Maximum Row Size1.6 TB
Maximum Field Size1 GB
Maximum Rows per TableUnlimited
Maximum Columns per Table250 - 1600 depending on column types
Maximum Indexes per TableUnlimited
+included in the table below.

LimitValue
Maximum Database SizeUnlimited
Maximum Table Size32 TB
Maximum Row Size1.6 TB
Maximum Field Size1 GB
Maximum Rows per TableUnlimited
Maximum Columns per Table250 - 1600 depending on column types
Maximum Indexes per TableUnlimited

PostgreSQL has won praise from its users and industry recognition, including the Linux New Media Award for Best Database System and five time winner of the The Linux Journal Editors' Choice Award for best DBMS.

diff --git a/templates/pages/about/advantages.html b/templates/pages/about/advantages.html index eeb6a735..25eb806e 100644 --- a/templates/pages/about/advantages.html +++ b/templates/pages/about/advantages.html @@ -6,7 +6,7 @@

Immunity to over-deployment

-

Over-deployment is what some proprietary database vendors regard as their #1 licence compliance problem.  With PostgreSQL, no-one can sue you for breaking licensing agreements, as there is no associated licensing cost for the software.

+

Over-deployment is what some proprietary database vendors regard as their #1 licence compliance problem.  With PostgreSQL, no-one can sue you for breaking licensing agreements, as there is no associated licensing cost for the software.

This has several additional advantages:

  • More profitable business models with wide-scale deployment.
    • diff --git a/templates/pages/about/awards.html b/templates/pages/about/awards.html index feb75778..9ab282ed 100644 --- a/templates/pages/about/awards.html +++ b/templates/pages/about/awards.html @@ -7,7 +7,7 @@ @@ -81,7 +81,7 @@ @@ -92,7 +92,7 @@ diff --git a/templates/pages/about/press/faq.html b/templates/pages/about/press/faq.html index 53101079..70a26ce9 100644 --- a/templates/pages/about/press/faq.html +++ b/templates/pages/about/press/faq.html @@ -4,61 +4,61 @@

    Frequently Asked Questions

    -

    Q: What is the current version of PostgreSQL?
    +

    Q: What is the current version of PostgreSQL?
    A: 10, which was released October 5, 2017. This is our 28th major release in 30 years of development. We release a new version of PostgreSQL every year, which is unique among SQL databases.

    -

    Q: What will the version number of the next release be? What will the version number of the next patch release be?
    +

    Q: What will the version number of the next release be? What will the version number of the next patch release be?
    A: The next release of PostgreSQL will be version 11, and will follow a two-part version numbering scheme. So the first patch release for 10 will be 10.1. The version of PostgreSQL released in 2018 will be version 11.

    -

    Q: Why are older versions that are labeled 9.6.6 or 9.5.9?
    +

    Q: Why are older versions that are labeled 9.6.6 or 9.5.9?
    A: Because of the long history of our project the first two decimals are major releases. Thus 9.6, 9.5 etc. were all major releases. Minor releases have numbers like 9.6.6. Since version 10, the project has adopted a two-part version numbering scheme.

    -

    Q: How is PostgreSQL licensed? How much does it cost?
    +

    Q: How is PostgreSQL licensed? How much does it cost?
    A: PostgreSQL is released under the OSI-approved PostgreSQL License. There is no fee, even for use in commercial software products. Please see the PostgreSQL License

    -

    Q: How many developers work on PostgreSQL?
    +

    Q: How many developers work on PostgreSQL?
    A: About 200. As with other open source projects, of course, we depend on hundreds of community members for documentation, translations, advocacy, conferences, website development, infrastructure, and peer-to-peer support.

    -

    Q: How many PostgreSQL users are there, worldwide?
    +

    Q: How many PostgreSQL users are there, worldwide?
    A: Our wide distribution through the open source world and liberal licensing make that a difficult question to answer with any accuracy. 451Research estimates that around 30% of tech companies use PostgreSQL for core applications as of 2012, and around 11% of Debian users worldwide install PostgreSQL. A previous version, 8.0, had an estimated one million downloads within a seven months of release. However, most users get PostgreSQL with a Linux distribution, or with some of the many other products, OSS software, and hardware devices that include PostgreSQL. SDMagazine in a survey in summer 2004 estimated us as the 5th most popular SQL database system in the US for new projects, we are the most popular database download on Freshmeat, and many people have called us the most popular major database system in Japan. We have approximately 35,000 people on our community mailing lists, but of course many users do not subscribe to a list.

    -

    Q: Can we talk to some of your users?
    +

    Q: Can we talk to some of your users?
    A: Please contact press@postgresql.org and our press volunteers will try to arrange a contact.

    -

    Q: What company owns PostgreSQL?
    +

    Q: What company owns PostgreSQL?
    A: None. We are an unincorporated association of volunteers and companies who share code under the PostgreSQL License. The PostgreSQL project involves a couple dozen companies who either support PostgreSQL contributors or directly contribute corporate projects to our repository. Some of our major corporate sponsors are on the sponsors page, and there are many more companies who contribute to the project in other ways.

    -

    Q: Where can people get support for PostgreSQL?
    +

    Q: Where can people get support for PostgreSQL?
    A: There are several companies which provide paid support for PostgreSQL. Most of them are regional in nature. People should contact the nearest regional contact volunteer to be connected with one or more companies, or check our professional services list.

    -

    Q: What's the relationship between the PostgreSQL Project, EnterpriseDB, 2ndQuadrant, CommandPrompt, SRA, Heroku, Crunchy Data and others?
    +

    Q: What's the relationship between the PostgreSQL Project, EnterpriseDB, 2ndQuadrant, CommandPrompt, SRA, Heroku, Crunchy Data and others?
    A: The PostgreSQL project enjoys the support of multiple companies who sell products or services built with PostgreSQL, and in turn contribute code, money and staff time to the project. None of them "own" PostgreSQL, nor is any individual company responsible for PostgreSQL code development. This is the same as Linux, Apache and FreeBSD.

    -

    Q: Does PostgreSQL run on the Cloud?
    +

    Q: Does PostgreSQL run on the Cloud?
    A: Yes. Like other open source databases, PostgreSQL is easy to run in both containers and virtual machines and is highly portable. Many companies have support for PostgreSQL in cloud hosting environments, including Heroku, Amazon, VMware, Engine Yard, Compose.io, EnterpriseDB, and Red Hat.

    -

    Q: How does PostgreSQL compare to MySQL?
    +

    Q: How does PostgreSQL compare to MySQL?
    A: This is a topic that can start several hours of discussion. As a quick summary, MySQL is the "easy-to-use, web developer" database, and PostgreSQL is the "feature-rich, standards-compliant" database. PostgreSQL is liberally licensed and owned by its community; MySQL is GPL-licensed and owned by Oracle. Beyond that, each database user should make his own evaluation; open source software makes doing comparisons very easy.

    -

    Q: How does PostgreSQL compare to Oracle/DB2/MS SQL Server/Informix?
    +

    Q: How does PostgreSQL compare to Oracle/DB2/MS SQL Server/Informix?
    A: Our feature set is generally considered to be very competitive with other leading SQL RDBMSes. Certainly there are features some of them have which we don't, and the reverse is also true. To date, only a few benchmarks have been published showing PostgreSQL to be within 10-30% of proprietary competitors (sometimes faster, sometimes slower). However, we have had many users migrate from other database systems – primarily Oracle and Informix – and they are completely satisfied with the performance of their PostgreSQL systems.

    -

    Q: How does PostgreSQL compare to "NoSQL"?
    +

    Q: How does PostgreSQL compare to "NoSQL"?
    A: The term "NoSQL" covers such a diverse array of non-relational database implementations ... from tiny embedded databases like BerkeleyDB to massive clustered data processing platforms like Hadoop ... that it's impossible to comment on them as a general class. Non-relational databases preceded relational databases and have existed alongside them for forty years, so choosing between relational and nonrelational databases is nothing new. Users should choose the database whose features, implementation, and community support their current application needs. Further, using multiple different databases for large projects is fast becoming the norm, and PostgreSQL users are no exception.

    -

    Q: Are there any published benchmarks for PostgreSQL?
    +

    Q: Are there any published benchmarks for PostgreSQL?
    A: To date there is one: a SpecJAppserver2004 benchmark, which at time of publication was within 10% of the leading commercial SQL RDBMS. We are not certain when another benchmark will be published, as verifiable benchmarks are expensive and time-consuming for a not-for-profit community to undertake.

    -

    Q: When will PostgreSQL get database server clustering?
    +

    Q: When will PostgreSQL get database server clustering?
    A: We already have it. Since no one type of clustering satisfies all needs, we have several different clustering tools which take various clustering approaches. The open source projects PostgresXC and Postgres-XL are available, as well as open source forks and proprietary tools such as Greenplum Database, Aster Data, CitusData and several others. Also, PostgreSQL is supported by filesystem-based clustering systems for failover, including ones from Red Hat, Microsoft, Veritas and Oracle.

    -

    Q: When will 10 come out?
    +

    Q: When will 10 come out?
    A: The PostgreSQL project begins work on the next version of PostgreSQL in July of each year, and it generally takes 12 to 15 months to work to a release. So expect 10 around September 2017. We are the only major SQL database which releases every year.

    -

    Q: What features will 10 have?
    +

    Q: What features will 10 have?
    A: As always, we can't be certain what will go in and what won't; the project has strict quality standards that not all patches can make before deadline. All we can tell you is what's currently being worked on, which includes additional parallel operations, aggregation push-down for FDWs, built-in streaming logical replication with pg_logical, SCRAM authentication, improvements to continous backup, improved hash indexes, reduced Write-Ahead Logging, quorum commit for replicas, and several other features. By the time 10 is released, though, this feature list will have changed considerably.

    -

    Q: How do you pronounce PostgreSQL
    +

    Q: How do you pronounce PostgreSQL
    A: post-GRES-que-ell, per this audio file. Many people, however, just say "post-GRES" or "post-GREZ".

    {%endblock%} diff --git a/templates/pages/developer/backend.html b/templates/pages/developer/backend.html index 4b9912cb..1549a095 100644 --- a/templates/pages/developer/backend.html +++ b/templates/pages/developer/backend.html @@ -5,7 +5,7 @@

    Backend Flowchart

    -

    Click on an item to see more detail or look at the full +

    Click on an item to see more detail or look at the full index.

    flowchart @@ -55,8 +55,8 @@ href="https://git.postgresql.org/gitweb/?p=postgresql.git;a=blob;f=src/include/n or SelectStmt.

    -

    The statement is then identified as complex (SELECT / INSERT / -UPDATE / DELETE) or simple, e.g CREATE USER, ANALYZE, +

    The statement is then identified as complex (SELECT / INSERT / +UPDATE / DELETE) or simple, e.g CREATE USER, ANALYZE, etc. Simple utility commands that do not require the executor are processed by statement-specific functions in the commands module. Complex statements require more handling.

    @@ -64,38 +64,38 @@ Complex statements require more handling.

    The parser takes a complex query, and creates a Query structure that contains all the elements used by complex queries. -Query.qual holds the WHERE clause qualification, which is filled +Query.qual holds the WHERE clause qualification, which is filled in by transformWhereClause(). Each table referenced in the query is represented by a RangeTableEntry, -and they are linked together to form the range table of the +and they are linked together to form the range table of the query, which is generated by transformFromClause(). Query.rtable holds the query's range table.

    -

    Certain queries, like SELECT, return columns of data. Other -queries, like INSERT and UPDATE, specify the columns +

    Certain queries, like SELECT, return columns of data. Other +queries, like INSERT and UPDATE, specify the columns modified by the query. These column references are converted to TargetEntry -entries, which are linked together to make up the target list of +entries, which are linked together to make up the target list of the query. The target list is stored in Query.targetList, which is generated by transformTargetList().

    -

    Other query elements, like aggregates(SUM()), GROUP -BY, and ORDER BY are also stored in their own Query +

    Other query elements, like aggregates(SUM()), GROUP +BY, and ORDER BY are also stored in their own Query fields.

    The next step is for the Query to be modified by any -VIEWS or RULES that may apply to the query. This is +VIEWS or RULES that may apply to the query. This is performed by the rewrite system.

    The optimizer uses the Query structure to determine the best table join order and join -type of each table in the RangeTable, using Query.qual(WHERE +type of each table in the RangeTable, using Query.qual(WHERE clause) to consider optimal index usage.

    The path module then generates an optimal Upcoming minor releases

    -The PostgreSQL project aims to make at least one minor release every quarter, +The PostgreSQL project aims to make at least one minor release every quarter, on a predefined schedule. If it becomes necessary due to an important bugfix or security issue, more releases will be made between these dates, so this list should be considered a minimum. At each of these dates, a new minor release will be made diff --git a/templates/pages/developer/summerofcodeadvice.html b/templates/pages/developer/summerofcodeadvice.html index b176410f..de8b6c49 100644 --- a/templates/pages/developer/summerofcodeadvice.html +++ b/templates/pages/developer/summerofcodeadvice.html @@ -7,7 +7,7 @@

    Be Foresighted: Include a full plan of action with your proposal, about one half to a full page of what you're going to do and how you think you will do it, and possibly even what you will do if your initial approach does not work.

    -Be Documented: Include academic references, as links or brief quotes, which back up your ideas. That kind of stuff impresses us. On the other hand, do not include 15 pages of reference materials; we won't read it. Summarize. +Be Documented: Include academic references, as links or brief quotes, which back up your ideas. That kind of stuff impresses us. On the other hand, do not include 15 pages of reference materials; we won't read it. Summarize.

    Be Known: If you know anyone in open source who can vouch for your code quality and/or diligence, use them as a reference. @@ -26,7 +26,7 @@ projects and a bold proposal makes us think you might be a candidate. Yes, we offered up the TODO list as ideas, but stuff that we'd never thought of before got moderated up even if it didn't get accepted.

    -Be Realistic: SoC requires you to complete a project in 3 months or less. So don't be so bold that your proposal can't be finished. One proposal we +Be Realistic: SoC requires you to complete a project in 3 months or less. So don't be so bold that your proposal can't be finished. One proposal we rejected almost immediately said "As a whole, I think this idea is too large to be pulled off by one person in 3 months." We agreed.

    diff --git a/templates/pages/docs/books.html b/templates/pages/docs/books.html index 548746d2..37cc31eb 100644 --- a/templates/pages/docs/books.html +++ b/templates/pages/docs/books.html @@ -496,7 +496,7 @@ Current version at publication: 9.0
    Format: Paperback
    Published: November 2010
    - This is the official reference documentation for the PostgreSQL RDBMS, in printed format. + This is the official reference documentation for the PostgreSQL RDBMS, in printed format.

    diff --git a/templates/pages/download.html b/templates/pages/download.html index c9c9edbc..12ebdaf0 100644 --- a/templates/pages/download.html +++ b/templates/pages/download.html @@ -55,7 +55,7 @@ Instructions for building from source can be found in the There are source code and binary packages of beta and release candidates, and of the current development code available for testing and evaluation of new features. Note that these builds should -be used for testing purposes only, and not for production systems. +be used for testing purposes only, and not for production systems.

    3rd party distributions

    @@ -72,7 +72,7 @@ on your PC.

    Big Data Analytics with PostgreSQL

    2ndQuadrant Unified Data Analytics -(2UDA – pronounced tudor) is a data analytics application suite +(2UDA – pronounced tudor) is a data analytics application suite that unifies databases, spreadsheets, data mining and visualisation in one seamless desktop installer. Once installed, 2UDA gives users access to the dramatic data visualisation and data mining capabilities of Orange, utilizing diff --git a/templates/pages/download/linux.html b/templates/pages/download/linux.html index 3a78168e..aff505f7 100644 --- a/templates/pages/download/linux.html +++ b/templates/pages/download/linux.html @@ -4,7 +4,7 @@

    Linux downloads (other)

    -Note! These are the generic Linux download instructions. If you +Note! These are the generic Linux download instructions. If you are using one of the major Linux distributions, you should read the distribution specific instructions:

    diff --git a/templates/pages/download/linux/debian.html b/templates/pages/download/linux/debian.html index 66f6a3b8..09008690 100644 --- a/templates/pages/download/linux/debian.html +++ b/templates/pages/download/linux/debian.html @@ -45,7 +45,7 @@ To use the apt repository, follow these steps: -
  • Create the file /etc/apt/sources.list.d/pgdg.list, and add a line +
  • Create the file /etc/apt/sources.list.d/pgdg.list, and add a line for the repository deb http://apt.postgresql.org/pub/repos/apt/ YOUR_DEBIAN_VERSION_HERE-pgdg main
    • @@ -66,7 +66,7 @@ questions, please see the apt page on

    Included in distribution

    Debian includes PostgreSQL by default. To install PostgreSQL on -Debian, use the apt-get (or other apt-driving) command: +Debian, use the apt-get (or other apt-driving) command:

    apt-get install postgresql-9.6 diff --git a/templates/pages/download/linux/linux_oneclick.inc b/templates/pages/download/linux/linux_oneclick.inc index e01cea5b..59b4e7e7 100644 --- a/templates/pages/download/linux/linux_oneclick.inc +++ b/templates/pages/download/linux/linux_oneclick.inc @@ -28,6 +28,6 @@ This download is intended for users who wish to include PostgreSQL as part of an

    -Note: The installers do not integrate with +Note: The installers do not integrate with platform-specific packaging systems.

    diff --git a/templates/pages/download/linux/linux_openscg.inc b/templates/pages/download/linux/linux_openscg.inc index d85f98c3..1ede80d6 100644 --- a/templates/pages/download/linux/linux_openscg.inc +++ b/templates/pages/download/linux/linux_openscg.inc @@ -13,6 +13,6 @@ the packages from BigSQL for all supported versions.

    -Note: The cross distribution packages do not fully integrate with +Note: The cross distribution packages do not fully integrate with the platform-specific packaging systems.

    diff --git a/templates/pages/download/linux/redhat.html b/templates/pages/download/linux/redhat.html index fa0078e3..d32f8b1d 100644 --- a/templates/pages/download/linux/redhat.html +++ b/templates/pages/download/linux/redhat.html @@ -55,8 +55,8 @@ To use the yum repository, follow these steps:

    Included in distribution

    These distributions all include PostgreSQL by default. To install -PostgreSQL from these repositories, use the yum command on RHEL 5,6 and 7, -or dnf command on Fedora 24+: +PostgreSQL from these repositories, use the yum command on RHEL 5,6 and 7, +or dnf command on Fedora 24+:

    diff --git a/templates/pages/download/linux/suse.html b/templates/pages/download/linux/suse.html index 77bfcd7d..6a2304c6 100644 --- a/templates/pages/download/linux/suse.html +++ b/templates/pages/download/linux/suse.html @@ -25,7 +25,7 @@ To use the SUSE RPM repository, please follow these openSUSE Build Service -in the project server:database:postgresql. +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 diff --git a/templates/pages/download/linux/ubuntu.html b/templates/pages/download/linux/ubuntu.html index a34004ce..98e33c87 100644 --- a/templates/pages/download/linux/ubuntu.html +++ b/templates/pages/download/linux/ubuntu.html @@ -46,7 +46,7 @@ To use the apt repository, follow these steps: -

  • Create the file /etc/apt/sources.list.d/pgdg.list, and add a line +
  • Create the file /etc/apt/sources.list.d/pgdg.list, and add a line for the repository deb http://apt.postgresql.org/pub/repos/apt/ YOUR_UBUNTU_VERSION_HERE-pgdg main
    • @@ -67,7 +67,7 @@ questions, please see the apt page on

    Included in distribution

    Ubuntu includes PostgreSQL by default. To install PostgreSQL on -Ubuntu, use the apt-get (or other apt-driving) command: +Ubuntu, use the apt-get (or other apt-driving) command:

    apt-get install postgresql-9.6 diff --git a/templates/pages/download/snapshots.html b/templates/pages/download/snapshots.html index d6e50348..0c89ded2 100644 --- a/templates/pages/download/snapshots.html +++ b/templates/pages/download/snapshots.html @@ -13,7 +13,7 @@ new major versions of PostgreSQL. They are not built continually. Development snapshots are built from the latest source code and beta/rc versions that the developers are working on. These are 'bleeding edge' versions of PostgreSQL and -should not be used in production systems +should not be used in production systems as they have had little or no testing or quality control.

    diff --git a/templates/pages/support/security/faq/2013-04-04.html b/templates/pages/support/security/faq/2013-04-04.html index f0f6ad8e..bab85a77 100644 --- a/templates/pages/support/security/faq/2013-04-04.html +++ b/templates/pages/support/security/faq/2013-04-04.html @@ -48,12 +48,12 @@ normal, multiuser mode. This can be used to harm the server.

  • Configuration Setting Privilege Escalation: in the event that an attacker has a legitimate login on the database server, and the server is configured such that this user name and the database name are identical (e.g. user - web, database web), then this vulnerability may be used to + web, database web), then this vulnerability may be used to temporarily set one configuration variable with the privileges of the superuser.
  • Arbitrary Code Execution: if the attacker meets all of the qualifications under 2 above, and has the ability to save files to the filesystem as well - (even to the tmp directory), then they can use the vulnerability to + (even to the tmp directory), then they can use the vulnerability to load and execute arbitrary C code. SELinux will prevent this specific type of exploit.
    • diff --git a/templates/profserv/list.html b/templates/profserv/list.html index 06d177ac..64e0ab6f 100644 --- a/templates/profserv/list.html +++ b/templates/profserv/list.html @@ -9,7 +9,7 @@
    - 2008 Developer.com Product of the Year, Database Tool + 2008 Developer.com Product of the Year, Database Tool

    "And the winner is PostgreSQL. This one surprised us and taught us something about our audience base. We need to do a better job of covering this topic! Postgresql.org touts this product as "The world's most advanced open source database" and after seeing the votes, they may just be correct." @@ -16,7 +16,7 @@
    - 2006 Linux Journal Editors' Choice Awards for Best Database + 2006 Linux Journal Editors' Choice Awards for Best Database

    "It handles everything we throw at it and just keeps working, flawlessly. It's almost invisible from an administrative perspective. It handles huge quantities of data, and it has all of the goodies that we expect in a relational database (such as referential integrity, column-level constraints and checks, server-side functions, subselects and unions). The original 8.1 release, which came out in November 2005, included a number of new features, such as two-phase commits. We can't recommend PostgreSQL highly enough." @@ -25,7 +25,7 @@
    - 2005 Linux Journal Editors' Choice Awards for Best Database + 2005 Linux Journal Editors' Choice Awards for Best Database

    "More and more organizations are working with high-end database systems but can't afford, or don't want, a full-time database administrator. PostgreSQL complies with SQL standards but needs less babysitting than complicated legacy databases. Ludovic calls it, "easy to install, configure and relatively easy to tune for performance." In our June 2005 issue, he covered Slony-I, which adds replication to PostgreSQL, giving you multisite redundancy, increased performance or both. Reuven points out that PostgreSQL has programmer-friendly features, which for 8.0, include server-side scripting in Perl." @@ -34,7 +34,7 @@
    - 2004 ArsTechnica Best Server Application Award + 2004 ArsTechnica Best Server Application Award

    "It's rare for any kind of sizable organization to not use a database for anything, and to that end, PostgreSQL provides a very reliable solution for Linux users. Sporting many advanced features missing from other available database packages, PostgreSQL is a perennial favorite for many of our developers. " @@ -46,7 +46,7 @@
    - 2004 Linux Journal Editors' Choice Awards for Best Database + 2004 Linux Journal Editors' Choice Awards for Best Database

    "I strongly recommend PostgreSQL to anyone who needs a relational database." @@ -58,7 +58,7 @@
    - 2004 Linux New Media Award For Best Database + 2004 Linux New Media Award For Best Database

    "The PostgreSQL team has demonstrated that it is possible to produce a database with the price and ease of administration of MySQL, but with the feature set of Oracle. " @@ -70,7 +70,7 @@
    - 2003 Linux Journal Editors' Choice Awards for Best Database + 2003 Linux Journal Editors' Choice Awards for Best Database

    - 2002 Linux New Media Editors Choice Award for Best Database + 2002 Linux New Media Editors Choice Award for Best Database

    - 2000 Linux Journal Editors' Choice Awards for Best Database + 2000 Linux Journal Editors' Choice Awards for Best Database

    "For ``big-database'' features and the configurability and administration advantages of open source, we give PostgreSQL a big thumbs-up." @@ -104,7 +104,7 @@
    - 1999 LinuxWorld Editor's Choice Award for Best Database + 1999 LinuxWorld Editor's Choice Award for Best Database

    - + {%if s.provides_hosting and s.provides_support %} diff --git a/templates/search/listsearch.html b/templates/search/listsearch.html index ad67d158..773d0731 100644 --- a/templates/search/listsearch.html +++ b/templates/search/listsearch.html @@ -44,7 +44,7 @@ {%else%} {%if hitcount == 0 %} -

    Your search for {{query}} returned no hits.

    +

    Your search for {{query}} returned no hits.

    {%else%}

    Results {{firsthit}}-{{lasthit}} of {%if hitcount == 1000%}more than 1000{%else%}{{hitcount}}{%endif%}.

    {%if pagelinks %}Result pages: {{pagelinks|safe}}

    {%endif%} diff --git a/templates/search/sitesearch.html b/templates/search/sitesearch.html index a6e59ba0..5fc1c361 100644 --- a/templates/search/sitesearch.html +++ b/templates/search/sitesearch.html @@ -26,7 +26,7 @@ {%else%} {%if hitcount == 0 %} -

    Your search for {{query}} returned no hits.

    +

    Your search for {{query}} returned no hits.

    {%else%}

    Results {{firsthit}}-{{lasthit}} of {%if hitcount == 1000%}more than 1000{%else%}{{hitcount}}{%endif%}.

    {%if pagelinks %}Result pages: {{pagelinks|safe}}

    {%endif%} diff --git a/templates/support/versioning.html b/templates/support/versioning.html index 9c1b67b3..e82dce3f 100644 --- a/templates/support/versioning.html +++ b/templates/support/versioning.html @@ -5,7 +5,7 @@

    Versioning policy

    -We always recommend that all users run the latest available minor release for whatever major version is in use. +We always recommend that all users run the latest available minor release for whatever major version is in use.

    @@ -17,7 +17,7 @@ Major releases usually change the internal format of system tables and data file

    -Minor releases are numbered by increasing the last part of the version number. Beginning with version 10, this is the second part of the version number, e.g. 10.0 to 10.1; for older versions this is the third part of the version number, e.g. 9.5.3 to 9.5.4. The PostgreSQL team only adds bug fixes to minor releases. All users should upgrade to the most recent minor release as soon as possible. While upgrades always have some risk, PostgreSQL minor releases fix only frequently-encountered, security, and data corruption bugs to reduce the risk associated with upgrading. The community considers not upgrading to be riskier than upgrading. +Minor releases are numbered by increasing the last part of the version number. Beginning with version 10, this is the second part of the version number, e.g. 10.0 to 10.1; for older versions this is the third part of the version number, e.g. 9.5.3 to 9.5.4. The PostgreSQL team only adds bug fixes to minor releases. All users should upgrade to the most recent minor release as soon as possible. While upgrades always have some risk, PostgreSQL minor releases fix only frequently-encountered, security, and data corruption bugs to reduce the risk associated with upgrading. The community considers not upgrading to be riskier than upgrading.

    @@ -32,7 +32,7 @@ Upgrading to a minor release does not require a dump and restore; merely stop th

    PostgreSQL release support policy

    The PostgreSQL project aims to fully support a major release for -five years. After its end-of-life (EOL) month ends, a major version receives one final minor release. After that final minor release, bug fixing ceases for that major version. +five years. After its end-of-life (EOL) month ends, a major version receives one final minor release. After that final minor release, bug fixing ceases for that major version.

    diff --git a/templates/survey/results.html b/templates/survey/results.html index f04d0349..862615ab 100644 --- a/templates/survey/results.html +++ b/templates/survey/results.html @@ -2,7 +2,7 @@ {%block title%}Survey Results: {{survey}}{%endblock%} {%block contents%}

    Survey Results

    -

    The current results of our {{survey}} survey are:

    +

    The current results of our {{survey}} survey are:

    Name{{s.org.name}}{%if s.url%} ({{s.url}}){%endif%}{{s.org.name}}{%if s.url%} ({{s.url}}){%endif%}
    @@ -19,7 +19,7 @@ {%endfor%} - + -- 2.39.5
    TotalTotal {{survey.totalvotes}}