Apply Dan Scott's patch to correct SIP code location and fix other typos.

diff --git a/admin/sip.xml b/admin/sip.xml
index b22021b..5e8dd35 100644 (file)
--- a/admin/sip.xml
+++ b/admin/sip.xml
@@ -25,15 +25,9 @@
                  <para>This is a rough intro to installing the <systemitem class="protocol">SIP</systemitem> server for Evergreen.</para>\r
                <simplesect xml:id="Gettingthecode">\r
                            <title>Getting the code</title>\r
-                               <para>Current <systemitem class="protocol">SIP</systemitem> code lives at github:</para>\r
+                               <para>Current <systemitem class="protocol">SIP</systemitem> server code lives at in the Evergreen git repository:</para>\r
                                <screen><userinput>cd /opt</userinput></screen>\r
-                               <screen><userinput>git clone git://github.com/atz/SIPServer.git SIPServer</userinput></screen>\r
-                               <para>Or use the old style:</para>\r
-                               <screen><userinput>$ cd /opt</userinput></screen>\r
-                               <screen><userinput>$ sudo cvs -d:pserver:anonymous@openncip.cvs.sourceforge.net:/cvsroot/openncip login</userinput></screen>\r
-                               <para>When prompted for the CVS password, just hit Enter (sudo password may be req'd)</para>\r
-                               <screen><userinput>$ sudo cvs -z3 -d:pserver:anonymous@openncip.cvs.sourceforge.net:/cvsroot/openncip co -P SIPServer</userinput></screen>\r
-                                                        \r
+                               <screen><userinput>git clone git://git.evergreen-ils.org/SIPServer.git SIPServer</userinput></screen>\r
                </simplesect>\r
                <simplesect xml:id="Configuring_Server">\r
                        <title>Configuring the Server</title>\r
@@ -98,8 +92,8 @@ max_servers='25'
                                        <para>OR use SQL like:</para>\r
 <screen>\r
 <userinput>\r
-INSERT INTO permission.grp_tree (id,name,parent,description,application_perm) \r
-VALUES (8, 'SIP', 1, 'SIP2 Client Systems', 'group_application.user.sip_client');\r
+INSERT INTO permission.grp_tree (name,parent,description,application_perm) \r
+VALUES ('SIP', 1, 'SIP2 Client Systems', 'group_application.user.sip_client');\r
  \r
 INSERT INTO\r
   permission.grp_perm_map (grp, perm, depth, grantable)\r
@@ -128,13 +122,13 @@ WHERE
 <screen>\r
 <userinput>\r
 SELECT *\r
-FROM permission.grp_perm_map JOIN permission.perm_list ON\r
-permission.grp_perm_map.perm=permission.perm_list.id\r
-WHERE grp=8;\r
+FROM permission.grp_perm_map pgpm\r
+    INNER JOIN permission.perm_list ppl ON pgpm.perm = ppl.id\r
+    INNER JOIN permission.grp_tree pgt ON pgt.id = pgpm.grp\r
+WHERE pgt.name = 'SIP';\r
 </userinput>\r
 </screen>\r
                                        \r
-                                       <para>Keep in mind that the id <emphasis role="bold">(8)</emphasis> may not necessarily be available on your system.</para>                             \r
                                </step>\r
                                <step>\r
                                        <para>For each account created in the &lt;login&gt; section of <filename>oils_sip.xml</filename>, create a user (via the staff client user editor) \r
@@ -208,7 +202,7 @@ log { source(s_all); filter(f_eg_sip); destination(eg_sip); };
                        <title>Testing Your <systemitem class="protocol">SIP</systemitem> Connection</title><indexterm><primary>SIP</primary></indexterm>\r
                        <itemizedlist>\r
                                <listitem>\r
-                                       <para>In the top level CVS checkout of the SIPServer code.</para>\r
+                                       <para>In the root directory of the SIPServer code:</para>\r
                                        <screen><userinput>$ cd SIPServer/t</userinput></screen>\r
                                </listitem>\r
                                <listitem>\r
@@ -451,7 +445,7 @@ Escape character is '^]'.
                                        <listitem>99: other</listitem>\r
                        </itemizedlist>\r
                        <note>\r
-                               <para>the logic for Evergreen to determine the content is magnetic_media comes from either legacy circ scripts or search_config_circ_modifier. \r
+                               <para>The logic for Evergreen to determine whether the content is magnetic_media comes from either legacy circ scripts or search_config_circ_modifier. \r
                                The default is non-magnetic.<indexterm><primary>magnetic media</primary></indexterm> \r
                                The same is true for media_type (default 001). Evergreen does not populate the collection_code because it does not really have any, but it will provide the \r
                                call_number where available.</para>\r