On Tue, Sep 8, 2020 at 4:51 PM Tom Lane <t...@sss.pgh.pa.us> wrote:

> Magnus Hagander <mag...@hagander.net> writes:
> > I think we're talking about a different repetitiveness. If I apply Davids
> > suggestion to that patch, then instead of:
>
> > +  <para>
> > +   If you are using a pre-packaged version
> > +   of <productname>PostgreSQL</productname>, it may well have a specific
> > +   convention for where to place the data directory, and it may also
> > +   provide a script for creating the data directory.  In that case you
>
> > It would say something like
> > Pre-packaged versions of PostgreSQL may have a specific convention....
> > (rest unchanged).
>
> [ shrug... ]  Well, I wrote that text, so naturally I like it the way
> it is ;-).  Perhaps a neutral observer would like the shorter version
> better, not sure.  But I think pluralizing "versions" is going to make
> it harder to construct the rest of the sentence non-ambiguously.
> You really only want to be talking about one data directory location
> and one wrapper script.
>

Yeah, I guess it can work either way. I don't feel too strongly about that
one, so I'll leave it to David to argue for that standpoint if he thinks it
applies here as well.

That leaves just the part of adding the actual new chapter of my patch.
PFA. Thoughts on that?

-- 
 Magnus Hagander
 Me: https://www.hagander.net/ <http://www.hagander.net/>
 Work: https://www.redpill-linpro.com/ <http://www.redpill-linpro.com/>
diff --git a/doc/src/sgml/filelist.sgml b/doc/src/sgml/filelist.sgml
index 64b5da0070..463bdfd29c 100644
--- a/doc/src/sgml/filelist.sgml
+++ b/doc/src/sgml/filelist.sgml
@@ -36,6 +36,7 @@
 <!ENTITY client-auth   SYSTEM "client-auth.sgml">
 <!ENTITY diskusage     SYSTEM "diskusage.sgml">
 <!ENTITY high-availability      SYSTEM "high-availability.sgml">
+<!ENTITY installbin    SYSTEM "install-binaries.sgml">
 <!ENTITY installation  SYSTEM "installation.sgml">
 <!ENTITY installw      SYSTEM "install-windows.sgml">
 <!ENTITY maintenance   SYSTEM "maintenance.sgml">
diff --git a/doc/src/sgml/install-binaries.sgml b/doc/src/sgml/install-binaries.sgml
new file mode 100644
index 0000000000..36405e74cc
--- /dev/null
+++ b/doc/src/sgml/install-binaries.sgml
@@ -0,0 +1,24 @@
+<!-- doc/src/sgml/install-binaries.sgml -->
+<chapter id="install-binaries">
+ <title>Installation from Binaries</title>
+
+ <indexterm>
+  <primary>installation</primary>
+  <secondary>binaries</secondary>
+ </indexterm>
+
+ <para>
+  <productname>PostgreSQL</productname> is available in the form of binary
+  packages for most common operating systems today. When available, this is
+  the recommended way to install PostgreSQL for users of the system. Building
+  from source (see <xref linkend="installation" />) is only recommended for
+  people developing <productname>PostgreSQL</productname> or extensions.
+ </para>
+
+ <para>
+  For an updated list of platforms providing binary packages, please visit
+  the Download section on the <productname>PostgreSQL</productname> website at
+  <ulink url="https://www.postgresql.org/download/";></ulink> and follow the
+  instructions for the specific platform.
+ </para>
+</chapter>
diff --git a/doc/src/sgml/install-windows.sgml b/doc/src/sgml/install-windows.sgml
index 11f5957aca..844ef2cbd2 100644
--- a/doc/src/sgml/install-windows.sgml
+++ b/doc/src/sgml/install-windows.sgml
@@ -11,7 +11,8 @@
  <para>
   It is recommended that most users download the binary distribution for
   Windows, available as a graphical installer package
-  from the <productname>PostgreSQL</productname> website. Building from source
+  from the <productname>PostgreSQL</productname> website at
+  <ulink url="https://www.postgresql.org/download/";></ulink>. Building from source
   is only intended for people developing <productname>PostgreSQL</productname>
   or extensions.
  </para>
diff --git a/doc/src/sgml/installation.sgml b/doc/src/sgml/installation.sgml
index 552303e211..ce9bdb1297 100644
--- a/doc/src/sgml/installation.sgml
+++ b/doc/src/sgml/installation.sgml
@@ -21,7 +21,7 @@ documentation.  See standalone-profile.xsl for details.
   <productname>PostgreSQL</productname> using the source code
   distribution.  If you are installing a pre-packaged distribution,
   such as an RPM or Debian package, ignore this chapter
-  and read the packager's instructions instead.
+  and see <xref linkend="install-binaries" /> instead.
  </para>
 
  <para>
diff --git a/doc/src/sgml/postgres.sgml b/doc/src/sgml/postgres.sgml
index c41ce9499b..730d5fdc34 100644
--- a/doc/src/sgml/postgres.sgml
+++ b/doc/src/sgml/postgres.sgml
@@ -154,6 +154,7 @@ break is not needed in a wider output rendering.
    </para>
   </partintro>
 
+  &installbin;
   &installation;
   &installw;
   &runtime;

Reply via email to