Merge from PG master upto d5cb3bab564e0927ffac7c8729eacf181a12dd40

This is the result of the "git merge remotes/PGSQL/master" upto the said commit
point. We have done some basic analysis, fixed compilation problems etc, but
bulk of the logical problems in conflict resolution etc will be handled by
subsequent commits.

1 files changed, 5 insertions, 6 deletions

diff --git a/doc/src/sgml/ref/create_function.sgml b/doc/src/sgml/ref/create_function.sgml
index ac2a5a5f48..4868317a12 100644
--- a/doc/src/sgml/ref/create_function.sgml
+++ b/doc/src/sgml/ref/create_function.sgml
@@ -188,8 +188,8 @@ CREATE [ OR REPLACE ] FUNCTION
       </para>
       <para>
        Depending on the implementation language it might also be allowed
-       to specify <quote>pseudotypes</> such as <type>cstring</>.
-       Pseudotypes indicate that the actual argument type is either
+       to specify <quote>pseudo-types</> such as <type>cstring</>.
+       Pseudo-types indicate that the actual argument type is either
        incompletely specified, or outside the set of ordinary SQL data types.
       </para>
       <para>
@@ -227,7 +227,7 @@ CREATE [ OR REPLACE ] FUNCTION
        can be a base, composite, or domain type,
        or can reference the type of a table column.
        Depending on the implementation language it might also be allowed
-       to specify <quote>pseudotypes</> such as <type>cstring</>.
+       to specify <quote>pseudo-types</> such as <type>cstring</>.
        If the function is not supposed to return a value, specify
        <type>void</> as the return type.
       </para>
@@ -429,7 +429,7 @@ CREATE [ OR REPLACE ] FUNCTION
       is to be executed with the privileges of the user that calls it.
       That is the default.  <literal>SECURITY DEFINER</literal>
       specifies that the function is to be executed with the
-      privileges of the user that created it.
+      privileges of the user that owns it.
      </para>
 
      <para>
@@ -780,7 +780,7 @@ SELECT * FROM dup(42);
 
    <para>
     Because a <literal>SECURITY DEFINER</literal> function is executed
-    with the privileges of the user that created it, care is needed to
+    with the privileges of the user that owns it, care is needed to
     ensure that the function cannot be misused.  For security,
     <xref linkend="guc-search-path"> should be set to exclude any schemas
     writable by untrusted users.  This prevents
@@ -880,7 +880,6 @@ COMMIT;
    <member><xref linkend="sql-grant"></member>
    <member><xref linkend="sql-load"></member>
    <member><xref linkend="sql-revoke"></member>
-   <member><xref linkend="app-createlang"></member>
   </simplelist>
  </refsect1>