From 79a323ab49138c119231609554ae5aa7f6285d38 Mon Sep 17 00:00:00 2001
From: Peter Eisentraut <peter_e@gmx.net>
Date: Thu, 24 Jan 2008 06:23:33 +0000
Subject: [PATCH] Change /contrib to contrib for consistency.

---
 configure                      |  4 ++--
 configure.in                   |  8 ++++----
 doc/FAQ_turkish                |  2 +-
 doc/TODO                       |  8 ++++----
 doc/src/FAQ/FAQ_turkish.html   |  2 +-
 doc/src/FAQ/TODO.html          |  8 ++++----
 doc/src/sgml/installation.sgml | 10 +++++-----
 doc/src/sgml/runtime.sgml      |  4 ++--
 src/include/pg_config.h.in     |  2 +-
 src/tools/pgindent/README      |  2 +-
 10 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/configure b/configure
index 5001837e981..751c5f61036 100755
--- a/configure
+++ b/configure
@@ -896,9 +896,9 @@ Optional Packages:
   --with-openssl          build with OpenSSL support
   --without-readline      do not use GNU Readline nor BSD Libedit for editing
   --with-libedit-preferred  prefer BSD Libedit over GNU Readline
-  --with-ossp-uuid        use OSSP UUID library when building /contrib/uuid-ossp
+  --with-ossp-uuid        use OSSP UUID library when building contrib/uuid-ossp
   --with-libxml           build with XML support
-  --with-libxslt          use XSLT support when building /contrib/xml2
+  --with-libxslt          use XSLT support when building contrib/xml2
   --with-system-tzdata=DIR  use system time zone data in DIR
   --without-zlib          do not use Zlib
   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
diff --git a/configure.in b/configure.in
index 31d2b24e7c0..dbae08f7daf 100644
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-dnl $PostgreSQL: pgsql/configure.in,v 1.544 2008/01/18 04:47:32 scrappy Exp $
+dnl $PostgreSQL: pgsql/configure.in,v 1.545 2008/01/24 06:23:32 petere Exp $
 dnl
 dnl Developers, please strive to achieve this order:
 dnl
@@ -572,7 +572,7 @@ PGAC_ARG_BOOL(with, libedit-preferred, no,
 #
 # OSSP UUID library
 #
-PGAC_ARG_BOOL(with, ossp-uuid, no, [  --with-ossp-uuid        use OSSP UUID library when building /contrib/uuid-ossp ])
+PGAC_ARG_BOOL(with, ossp-uuid, no, [  --with-ossp-uuid        use OSSP UUID library when building contrib/uuid-ossp])
 AC_SUBST(with_ossp_uuid)
 
 
@@ -603,8 +603,8 @@ AC_SUBST(with_libxml)
 #
 # XSLT
 #
-PGAC_ARG_BOOL(with, libxslt, no, [  --with-libxslt          use XSLT support when building /contrib/xml2],
-              [AC_DEFINE([USE_LIBXSLT], 1, [Define to 1 to use XSLT support when building /contrib/xml2. (--with-libxslt)])])
+PGAC_ARG_BOOL(with, libxslt, no, [  --with-libxslt          use XSLT support when building contrib/xml2],
+              [AC_DEFINE([USE_LIBXSLT], 1, [Define to 1 to use XSLT support when building contrib/xml2. (--with-libxslt)])])
 
 
 AC_SUBST(with_libxslt)
diff --git a/doc/FAQ_turkish b/doc/FAQ_turkish
index cbc416cacc4..479fac64707 100644
--- a/doc/FAQ_turkish
+++ b/doc/FAQ_turkish
@@ -1173,7 +1173,7 @@ ORDER BY col1
     5.2) PostgreSQL'e nas�l yeni tipler/fonksiyonlar ekleyebilirim?
     
    �al��malar�n�z� pgsql-hackers e-posta listesine g�nderiniz. Kodunuz
-   incelendikten sonra /contrib dizinine konacakt�r.
+   incelendikten sonra contrib dizinine konacakt�r.
    
     5.3) Bir tuple dond�rmek icin bir C fonksiyonunu nasil yazar�m?
     
diff --git a/doc/TODO b/doc/TODO
index b16ec5f4027..38452895d5e 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -272,11 +272,11 @@ Data Types
 
 * Binary Data
 
-	o Improve vacuum of large objects, like /contrib/vacuumlo?
+	o Improve vacuum of large objects, like contrib/vacuumlo?
 	o Add security checking for large objects
 	o Auto-delete large objects when referencing row is deleted
 
-          /contrib/lo offers this functionality.
+          contrib/lo offers this functionality.
 
 	o Allow read/write into TOAST values like large objects
 
@@ -1312,7 +1312,7 @@ Source Code
 ===========
 
 * Add use of 'const' for variables in source tree
-* Move some things from /contrib into main tree
+* Move some things from contrib into main tree
 * %Remove warnings created by -Wcast-align
 * Move platform-specific ps status display info from ps_status.c to ports
 * Add optional CRC checksum to heap and index pages
@@ -1321,7 +1321,7 @@ Source Code
 * Acquire lock on a relation before building a relcache entry for it
 * Allow cross-compiling by generating the zic database on the target system
 * Improve NLS maintenance of libpgport messages linked onto applications
-* Clean up casting in /contrib/isn
+* Clean up casting in contrib/isn
 
   http://archives.postgresql.org/pgsql-hackers/2006-11/msg00245.php
 
diff --git a/doc/src/FAQ/FAQ_turkish.html b/doc/src/FAQ/FAQ_turkish.html
index e0d618fb16b..20f970ab8d1 100644
--- a/doc/src/FAQ/FAQ_turkish.html
+++ b/doc/src/FAQ/FAQ_turkish.html
@@ -1000,7 +1000,7 @@ ORDER BY col1
 		
 		<h4><a name="5.2">5.2</a>) PostgreSQL'e nas�l yeni tipler/fonksiyonlar ekleyebilirim?</h4>
 		<p>�al��malar�n�z� pgsql-hackers e-posta listesine g�nderiniz. Kodunuz
-		incelendikten sonra /contrib dizinine konacakt�r.</p>
+		incelendikten sonra contrib dizinine konacakt�r.</p>
 		
 		<h4><a name="5.3">5.3</a>) Bir <i>tuple</i> dond�rmek icin bir C fonksiyonunu nasil yazar�m?</h4>
 		<p>PostgreSQL 7.3 s�r�m� ile birlikte, C, PL/PgSQL ve SQL kullan�larak tablo-d�nd�ren
diff --git a/doc/src/FAQ/TODO.html b/doc/src/FAQ/TODO.html
index 420d27f9a60..bc705911abc 100644
--- a/doc/src/FAQ/TODO.html
+++ b/doc/src/FAQ/TODO.html
@@ -248,10 +248,10 @@ first.  There is also a developer's wiki at<br/>
     </li></ul>
     </li><li>Binary Data
     <ul>
-      <li>Improve vacuum of large objects, like /contrib/vacuumlo?
+      <li>Improve vacuum of large objects, like contrib/vacuumlo?
       </li><li>Add security checking for large objects
       </li><li>Auto-delete large objects when referencing row is deleted
-<p>          /contrib/lo offers this functionality.
+<p>          contrib/lo offers this functionality.
 </p>
       </li><li>Allow read/write into TOAST values like large objects
 <p>          This requires the TOAST column to be stored EXTERNAL.
@@ -1167,7 +1167,7 @@ first.  There is also a developer's wiki at<br/>
 
 <ul>
   <li>Add use of 'const' for variables in source tree
-  </li><li>Move some things from /contrib into main tree
+  </li><li>Move some things from contrib into main tree
   </li><li>%Remove warnings created by -Wcast-align
   </li><li>Move platform-specific ps status display info from ps_status.c to ports
   </li><li>Add optional CRC checksum to heap and index pages
@@ -1176,7 +1176,7 @@ first.  There is also a developer's wiki at<br/>
   </li><li>Acquire lock on a relation before building a relcache entry for it
   </li><li>Allow cross-compiling by generating the zic database on the target system
   </li><li>Improve NLS maintenance of libpgport messages linked onto applications
-  </li><li>Clean up casting in /contrib/isn
+  </li><li>Clean up casting in contrib/isn
 <p>  <a href="http://archives.postgresql.org/pgsql-hackers/2006-11/msg00245.php">http://archives.postgresql.org/pgsql-hackers/2006-11/msg00245.php</a>
 </p>
   </li><li>Use UTF8 encoding for NLS messages so all server encodings can
diff --git a/doc/src/sgml/installation.sgml b/doc/src/sgml/installation.sgml
index 193348cd528..3827438e2bd 100644
--- a/doc/src/sgml/installation.sgml
+++ b/doc/src/sgml/installation.sgml
@@ -1,4 +1,4 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/installation.sgml,v 1.298 2007/11/28 15:42:31 petere Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/installation.sgml,v 1.299 2008/01/24 06:23:32 petere Exp $ -->
 
 <chapter id="installation">
  <title><![%standalone-include[<productname>PostgreSQL</>]]>
@@ -938,7 +938,7 @@ su - postgres
        <listitem>
         <para>
          Use the <ulink url="http://www.ossp.org/pkg/lib/uuid/">OSSP UUID
-         library</ulink> when building <filename>/contrib/uuid-ossp</>.
+         library</ulink> when building <filename>contrib/uuid-ossp</>.
          The library provides functions to generate
          UUIDs.<indexterm><primary>UUID</primary></indexterm>
         </para>
@@ -972,9 +972,9 @@ su - postgres
        <term><option>--with-libxslt</option></term>
        <listitem>
         <para>
-         Use libxslt when building <filename>/contrib/xml2</>.
-         <filename>/contrib/xml2</> relies on this library to perform
-         Stylesheet transformations of XML.
+         Use libxslt when building <filename>contrib/xml2</>.
+         <filename>contrib/xml2</> relies on this library to perform
+         XSL transformations of XML.
         </para>
        </listitem>
       </varlistentry>
diff --git a/doc/src/sgml/runtime.sgml b/doc/src/sgml/runtime.sgml
index eaf4f04d36d..22a640d6ee9 100644
--- a/doc/src/sgml/runtime.sgml
+++ b/doc/src/sgml/runtime.sgml
@@ -1,4 +1,4 @@
-<!-- $PostgreSQL: pgsql/doc/src/sgml/runtime.sgml,v 1.402 2008/01/08 18:07:38 momjian Exp $ -->
+<!-- $PostgreSQL: pgsql/doc/src/sgml/runtime.sgml,v 1.403 2008/01/24 06:23:32 petere Exp $ -->
 
 <chapter Id="runtime">
  <title>Operating System Environment</title>
@@ -1446,7 +1446,7 @@ $ <userinput>kill -INT `head -1 /usr/local/pgsql/data/postmaster.pid`</userinput
 
    <listitem>
     <para>
-     The <filename>/contrib</> function library
+     The <filename>contrib</> function library
      <function>pgcrypto</function> allows certain fields to be stored
      encrypted. This is useful if only some of the data is sensitive.
      The client supplies the decryption key and the data is decrypted
diff --git a/src/include/pg_config.h.in b/src/include/pg_config.h.in
index e147e86b7b4..e3a6c9982ad 100644
--- a/src/include/pg_config.h.in
+++ b/src/include/pg_config.h.in
@@ -672,7 +672,7 @@
 /* Define to 1 to build with XML support. (--with-libxml) */
 #undef USE_LIBXML
 
-/* Define to 1 to use XSLT support when building /contrib/xml2.
+/* Define to 1 to use XSLT support when building contrib/xml2.
    (--with-libxslt) */
 #undef USE_LIBXSLT
 
diff --git a/src/tools/pgindent/README b/src/tools/pgindent/README
index fa05274f21e..58a0ca2fd9f 100644
--- a/src/tools/pgindent/README
+++ b/src/tools/pgindent/README
@@ -7,7 +7,7 @@ To use pgindent:
 
 2) Install to /usr/local/pgsql
 
-3) Install all /contrib modules
+3) Install all contrib modules
 
 4) Save a list of typedefs by running:
 
-- 
GitLab