From c5e2333aaf510dce45d8de7deb461d8569832839 Mon Sep 17 00:00:00 2001
From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Thu, 14 Aug 2014 16:05:55 -0400
Subject: [PATCH] Update SysV parameter configuration documentation for
 FreeBSD.

FreeBSD hasn't made any use of kern.ipc.semmap since 1.1, and newer
releases reject attempts to set it altogether; so stop recommending
that it be adjusted.  Per bug #11161.

Back-patch to all supported branches.  Before 9.3, also incorporate
commit 7a42dff47, which touches the same text and for some reason
was not back-patched at the time.
---
 doc/src/sgml/runtime.sgml | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/doc/src/sgml/runtime.sgml b/doc/src/sgml/runtime.sgml
index bb7b8c16f2e..cfd353293f5 100644
--- a/doc/src/sgml/runtime.sgml
+++ b/doc/src/sgml/runtime.sgml
@@ -753,25 +753,27 @@ psql: could not connect to server: No such file or directory
         <command>loader</command> interfaces.  The following
         parameters can be set using <command>sysctl</command>:
 <screen>
-<prompt>$</prompt> <userinput>sysctl -w kern.ipc.shmall=32768</userinput>
-<prompt>$</prompt> <userinput>sysctl -w kern.ipc.shmmax=134217728</userinput>
-<prompt>$</prompt> <userinput>sysctl -w kern.ipc.semmap=256</userinput>
+<prompt>#</prompt> <userinput>sysctl kern.ipc.shmall=32768</userinput>
+<prompt>#</prompt> <userinput>sysctl kern.ipc.shmmax=134217728</userinput>
 </screen>
-        To have these settings persist over reboots, modify
+        To make these settings persist over reboots, modify
         <filename>/etc/sysctl.conf</filename>.
        </para>
 
        <para>
-        The remaining semaphore settings are read-only as far as
-        <command>sysctl</command> is concerned, but can be changed
-        before boot using the <command>loader</command> prompt:
-<screen>
-<prompt>(loader)</prompt> <userinput>set kern.ipc.semmni=256</userinput>
-<prompt>(loader)</prompt> <userinput>set kern.ipc.semmns=512</userinput>
-<prompt>(loader)</prompt> <userinput>set kern.ipc.semmnu=256</userinput>
-</screen>
-        Similarly these can be saved between reboots in
-        <filename>/boot/loader.conf</filename>.
+        These semaphore-related settings are read-only as far as
+        <command>sysctl</command> is concerned, but can be set in
+        <filename>/boot/loader.conf</filename>:
+<programlisting>
+kern.ipc.semmni=256
+kern.ipc.semmns=512
+kern.ipc.semmnu=256
+</programlisting>
+        After modifying these values a reboot is required for the new
+        settings to take effect.
+        (Note: FreeBSD does not use <varname>SEMMAP</>.  Older versions
+        would accept but ignore a setting for <literal>kern.ipc.semmap</>;
+        newer versions reject it altogether.)
        </para>
 
        <para>