diff --git a/doc/src/sgml/dfunc.sgml b/doc/src/sgml/dfunc.sgml
index 7a719b7ed3e..d4097e77404 100644
--- a/doc/src/sgml/dfunc.sgml
+++ b/doc/src/sgml/dfunc.sgml
@@ -9,9 +9,9 @@
previously mentioned, Postgres loads your code at
runtime, as required. In order to allow your code to be
dynamically loaded, you may have to compile and
- linkedit it in a special way. This section briefly
+ link-edit it in a special way. This section briefly
describes how to perform the compilation and
- linkediting required before you can load your user-defined
+ link-editing required before you can load your user-defined
functions into a running Postgres server. Note that
this process has changed as of Version 4.2.
@@ -126,7 +126,7 @@ The GNU C compiler usually does not provide the special
It is very easy to build dynamically-loaded object
- files under ULTRIX. ULTRIX does not have any sharedlibrary
+ files under ULTRIX. ULTRIX does not have any shared library
mechanism and hence does not place any restrictions on
the dynamic loader interface. On the other
hand, we had to (re)write a non-portable dynamic loader
@@ -140,7 +140,8 @@ The GNU C compiler usually does not provide the special
% cc -G 0 -c foo.c
produces an object file called foo.o that can then be
- dynamically loaded into Postgres. No additional loading or link-editing must be performed.
+ dynamically loaded into Postgres.
+No additional loading or link-editing must be performed.
@@ -149,7 +150,8 @@ The GNU C compiler usually does not provide the special
Under DEC OSF/1, you can take any simple object file
- and produce a shared object file by running the ld command over it with the correct options. The commands to
+ and produce a shared object file by running the ld command
+ over it with the correct options. The commands to
do this look like:
# simple DEC OSF/1 example
@@ -168,7 +170,8 @@ Actually, Postgres does not care
what you name the
file as long as it is a shared object file. If you prefer
to name your shared object files with the extension .o, this
-is fine with Postgres so long as you make sure that the correct
+is fine with Postgres
+ so long as you make sure that the correct
file name is given to the create function command. In
other words, you must simply be consistent. However, from a
pragmatic point of view, we discourage this practice because
@@ -205,8 +208,8 @@ If the file you specify is
very simple, since the commands to do it are just:
# simple HP-UX example
- % cc +z +u -c foo.c
- % ld -b -o foo.sl foo.o
+% cc +z +u -c foo.c
+% ld -b -o foo.sl foo.o
@@ -218,17 +221,21 @@ If the file you specify is
Under SunOS 4.x, the commands look like:
# simple SunOS 4.x example
- % cc -PIC -c foo.c
- % ld -dc -dp -Bdynamic -o foo.so foo.o
+% cc -PIC -c foo.c
+% ld -dc -dp -Bdynamic -o foo.so foo.o
and the equivalent lines under Solaris 2.x are:
# simple Solaris 2.x example
- % cc -K PIC -c foo.c
- or
- % gcc -fPIC -c foo.c
- % ld -G -Bdynamic -o foo.so foo.o
+% cc -K PIC -c foo.c
+% ld -G -Bdynamic -o foo.so foo.o
+
+ or
+
+# simple Solaris 2.x example
+% gcc -fPIC -c foo.c
+% ld -G -Bdynamic -o foo.so foo.o
diff --git a/doc/src/sgml/intro.sgml b/doc/src/sgml/intro.sgml
index 09a6ad3b02b..9c0e81c1b0d 100644
--- a/doc/src/sgml/intro.sgml
+++ b/doc/src/sgml/intro.sgml
@@ -275,7 +275,7 @@ Built-in types have been improved, including new wide-range date/time types and
-Overall backend code speed has been increased by approximately 20%, and backend startup speed has decreased 80%.
+Overall backend code speed has been increased by approximately 20%, and backend startup time has decreased 80%.