From 077dec8b6c19152fb3f200610a89c5f71e4045ee Mon Sep 17 00:00:00 2001
From: Daniel Gustafsson <dgustafsson@postgresql.org>
Date: Tue, 13 Feb 2024 14:09:24 +0100
Subject: Revert "Skip .DS_Store files in server side utils"

This reverts commit d3fdfdcd1c7f1b714a9a85b893d2c5afc60bea91.
Per failure reports from the buildfarm.
---
 doc/src/sgml/protocol.sgml          | 2 +-
 doc/src/sgml/ref/pg_basebackup.sgml | 3 +--
 doc/src/sgml/ref/pg_rewind.sgml     | 5 ++---
 3 files changed, 4 insertions(+), 6 deletions(-)

(limited to 'doc/src')

diff --git a/doc/src/sgml/protocol.sgml b/doc/src/sgml/protocol.sgml
index 449b1bc8d51..a22c8520c00 100644
--- a/doc/src/sgml/protocol.sgml
+++ b/doc/src/sgml/protocol.sgml
@@ -2835,7 +2835,7 @@ The commands accepted in replication mode are:
         <para>
          Files other than regular files and directories, such as symbolic
          links (other than for the directories listed above) and special
-         device and operating system files, are skipped.  (Symbolic links
+         device files, are skipped.  (Symbolic links
          in <filename>pg_tblspc</filename> are maintained.)
         </para>
        </listitem>
diff --git a/doc/src/sgml/ref/pg_basebackup.sgml b/doc/src/sgml/ref/pg_basebackup.sgml
index a583ead1cd2..c5cfa87d35e 100644
--- a/doc/src/sgml/ref/pg_basebackup.sgml
+++ b/doc/src/sgml/ref/pg_basebackup.sgml
@@ -832,8 +832,7 @@ PostgreSQL documentation
    The backup will include all files in the data directory and tablespaces,
    including the configuration files and any additional files placed in the
    directory by third parties, except certain temporary files managed by
-   PostgreSQL and operating system files.  But only regular files and
-   directories are copied, except that
+   PostgreSQL.  But only regular files and directories are copied, except that
    symbolic links used for tablespaces are preserved.  Symbolic links pointing
    to certain directories known to PostgreSQL are copied as empty directories.
    Other symbolic links and special device files are skipped.
diff --git a/doc/src/sgml/ref/pg_rewind.sgml b/doc/src/sgml/ref/pg_rewind.sgml
index be8b304512d..cdfacf70888 100644
--- a/doc/src/sgml/ref/pg_rewind.sgml
+++ b/doc/src/sgml/ref/pg_rewind.sgml
@@ -374,9 +374,8 @@ GRANT EXECUTE ON function pg_catalog.pg_read_binary_file(text, bigint, bigint, b
       <filename>backup_label</filename>,
       <filename>tablespace_map</filename>,
       <filename>pg_internal.init</filename>,
-      <filename>postmaster.opts</filename>,
-      <filename>postmaster.pid</filename> and
-      <filename>.DS_Store</filename> as well as any file or directory
+      <filename>postmaster.opts</filename>, and
+      <filename>postmaster.pid</filename>, as well as any file or directory
       beginning with <filename>pgsql_tmp</filename>, are omitted.
      </para>
     </step>
-- 
cgit v1.2.3