From 792d6edd5b53d31406bb7a25532a26d91ecb8851 Mon Sep 17 00:00:00 2001
From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Fri, 10 Nov 2006 22:32:20 +0000
Subject: [PATCH] Clean up some misleading references to %p being a full path,
 per Simon.

---
 doc/src/sgml/backup.sgml          | 4 ++--
 src/backend/access/transam/xlog.c | 4 ++--
 src/backend/postmaster/pgarch.c   | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/doc/src/sgml/backup.sgml b/doc/src/sgml/backup.sgml
index e71b61e324..8bafaf4c21 100644
--- a/doc/src/sgml/backup.sgml
+++ b/doc/src/sgml/backup.sgml
@@ -1,4 +1,4 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/backup.sgml,v 2.93 2006/11/04 18:20:27 tgl Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/backup.sgml,v 2.94 2006/11/10 22:32:20 tgl Exp $ -->
 
 <chapter id="backup">
  <title>Backup and Restore</title>
@@ -599,7 +599,7 @@ archive_command = 'test ! -f .../%f &amp;&amp; cp %p .../%f'
     In writing your archive command, you should assume that the file names to
     be archived may be up to 64 characters long and may contain any
     combination of ASCII letters, digits, and dots.  It is not necessary to
-    remember the original full path (<literal>%p</>) but it is necessary to
+    remember the original relative path (<literal>%p</>) but it is necessary to
     remember the file name (<literal>%f</>).
    </para>
 
diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
index 9b59006173..e5455c666b 100644
--- a/src/backend/access/transam/xlog.c
+++ b/src/backend/access/transam/xlog.c
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.254 2006/11/08 20:12:04 tgl Exp $
+ * $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.255 2006/11/10 22:32:20 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -2434,7 +2434,7 @@ RestoreArchivedFile(char *path, const char *xlogfname,
 			switch (sp[1])
 			{
 				case 'p':
-					/* %p: full path of target file */
+					/* %p: relative path of target file */
 					sp++;
 					StrNCpy(dp, xlogpath, endp - dp);
 					make_native_path(dp);
diff --git a/src/backend/postmaster/pgarch.c b/src/backend/postmaster/pgarch.c
index 3084506820..a40bf47b3a 100644
--- a/src/backend/postmaster/pgarch.c
+++ b/src/backend/postmaster/pgarch.c
@@ -19,7 +19,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/postmaster/pgarch.c,v 1.25 2006/08/07 17:41:42 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/postmaster/pgarch.c,v 1.26 2006/11/10 22:32:20 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -417,7 +417,7 @@ pgarch_archiveXlog(char *xlog)
 			switch (sp[1])
 			{
 				case 'p':
-					/* %p: full path of source file */
+					/* %p: relative path of source file */
 					sp++;
 					StrNCpy(dp, pathname, endp - dp);
 					make_native_path(dp);