aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2003-09-30 01:56:11 +0000
committerTom Lane <tgl@sss.pgh.pa.us>2003-09-30 01:56:11 +0000
commit444af9e0e81ac8f56118e22a00bc81d80e974c96 (patch)
tree1f194636f9fdbd025264a3b7d559ab3a0c2609ab
parentf038e089293a1fe6d059d3b2317d8d8919ce2350 (diff)
downloadpostgresql-444af9e0e81ac8f56118e22a00bc81d80e974c96.tar.gz
postgresql-444af9e0e81ac8f56118e22a00bc81d80e974c96.zip
Minor copy-editing.
-rw-r--r--doc/src/sgml/ref/copy.sgml22
1 files changed, 14 insertions, 8 deletions
diff --git a/doc/src/sgml/ref/copy.sgml b/doc/src/sgml/ref/copy.sgml
index 1c87091dff1..83a51362c5b 100644
--- a/doc/src/sgml/ref/copy.sgml
+++ b/doc/src/sgml/ref/copy.sgml
@@ -1,5 +1,5 @@
<!--
-$Header: /cvsroot/pgsql/doc/src/sgml/ref/copy.sgml,v 1.51 2003/09/22 00:16:57 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/ref/copy.sgml,v 1.52 2003/09/30 01:56:11 tgl Exp $
PostgreSQL documentation
-->
@@ -77,7 +77,7 @@ COPY <replaceable class="parameter">tablename</replaceable> [ ( <replaceable cla
<term><replaceable class="parameter">tablename</replaceable></term>
<listitem>
<para>
- The name (possibly schema-qualified) of an existing table.
+ The name (optionally schema-qualified) of an existing table.
</para>
</listitem>
</varlistentry>
@@ -355,10 +355,16 @@ COPY <replaceable class="parameter">tablename</replaceable> [ ( <replaceable cla
<para>
<command>COPY TO</command> will terminate each row with a Unix-style
- newline (<quote><literal>\n</></>), or carriage return/newline
- ("\r\n") for servers running MS Windows.
+ newline (<quote><literal>\n</></>). Servers running on MS Windows instead
+ output carriage return/newline (<quote><literal>\r\n</></>), but only for
+ <command>COPY</> to a server file; for consistency across platforms,
+ <command>COPY TO STDOUT</> always sends <quote><literal>\n</></>
+ regardless of server platform.
<command>COPY FROM</command> can handle lines ending with newlines,
- carriage returns, or carriage return/newlines.
+ carriage returns, or carriage return/newlines. To reduce the risk of
+ error due to un-backslashed newlines or carriage returns that were
+ meant as data, <command>COPY FROM</command> will complain if the line
+ endings in the input are not all alike.
</para>
</refsect2>
@@ -476,9 +482,9 @@ to be specified.
To determine the appropriate binary format for the actual tuple data you
should consult the <productname>PostgreSQL</productname> source, in
particular the <function>*send</> and <function>*recv</> functions for
-the data type (typically found in the <filename>src/backend/utils/adt</filename>
-directory). The <application>contrib/binarycopy</application> module
-can also be used to create an appropriate format file.
+each column's data type (typically these functions are found in the
+<filename>src/backend/utils/adt/</filename> directory of the source
+distribution).
</para>
<para>