From 588f370b163db25ae38504088b17610123dcb315 Mon Sep 17 00:00:00 2001
From: Daniel Gustafsson
Date: Tue, 13 Feb 2024 14:08:56 +0100
Subject: Revert "Skip .DS_Store files in server side utils"
This reverts commit 76bb6dd2e56c14e947196e638f86982424c51254.
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 5ac937f5b67..5482f1b7929 100644
--- a/doc/src/sgml/protocol.sgml
+++ b/doc/src/sgml/protocol.sgml
@@ -2795,7 +2795,7 @@ The commands accepted in replication mode are:
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 pg_tblspc are maintained.)
diff --git a/doc/src/sgml/ref/pg_basebackup.sgml b/doc/src/sgml/ref/pg_basebackup.sgml
index bab8c9e4806..4e2db60b836 100644
--- a/doc/src/sgml/ref/pg_basebackup.sgml
+++ b/doc/src/sgml/ref/pg_basebackup.sgml
@@ -726,8 +726,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 53bd04772ad..272bd113b9a 100644
--- a/doc/src/sgml/ref/pg_rewind.sgml
+++ b/doc/src/sgml/ref/pg_rewind.sgml
@@ -311,9 +311,8 @@ GRANT EXECUTE ON function pg_catalog.pg_read_binary_file(text, bigint, bigint, b
backup_label,
tablespace_map,
pg_internal.init,
- postmaster.opts,
- postmaster.pid and.
- .DS_Store.
+ postmaster.opts and
+ postmaster.pid.
--
cgit v1.2.3