GUACAMOLE-87: Fix upgrade script sections.

Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-manual/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-manual/commit/7c20ad66
Tree: 
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-manual/tree/7c20ad66
Diff: 
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-manual/diff/7c20ad66

Branch: refs/heads/master
Commit: 7c20ad66630675a8910932749ecceb6a688750e3
Parents: bf47f7c
Author: James Muehlner <[email protected]>
Authored: Thu Aug 25 23:14:23 2016 -0700
Committer: James Muehlner <[email protected]>
Committed: Thu Aug 25 23:14:23 2016 -0700

----------------------------------------------------------------------
 src/chapters/jdbc-auth.xml | 75 +++++++++++++++++++++++++++++++----------
 1 file changed, 58 insertions(+), 17 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-guacamole-manual/blob/7c20ad66/src/chapters/jdbc-auth.xml
----------------------------------------------------------------------
diff --git a/src/chapters/jdbc-auth.xml b/src/chapters/jdbc-auth.xml
index fc649df..52f1154 100644
--- a/src/chapters/jdbc-auth.xml
+++ b/src/chapters/jdbc-auth.xml
@@ -170,8 +170,8 @@ Type 'help;' or '\h' for help. Type '\c' to clear the 
current input statement.
                     script located within the <filename>upgrade/</filename> 
directory:</para>
                 <informalexample>
                     <screen><prompt>$</prompt> <userinput>ls 
schema/upgrade/</userinput>
-<computeroutput>upgrade-pre-0.8.2.sql upgrade-pre-0.9.7.sql 
upgrade-pre-0.9.10-incubating.sql
-upgrade-pre-0.9.6.sql upgrade-pre-0.9.8.sql</computeroutput>
+<computeroutput>upgrade-pre-0.8.2.sql   upgrade-pre-0.9.6.sql  
upgrade-pre-0.9.8.sql
+upgrade-pre-0.9.10.sql  upgrade-pre-0.9.7.sql  
upgrade-pre-0.9.9.sql</computeroutput>
 <prompt>$</prompt> <userinput>mysql -u root -p 
<replaceable>guacamole_db</replaceable> &lt; 
schema/upgrade/upgrade-pre-0.8.2.sql</userinput>
 <prompt>Enter password:</prompt> 
<userinput><replaceable>password</replaceable></userinput>
 <prompt>$</prompt></screen>
@@ -201,11 +201,19 @@ upgrade-pre-0.9.6.sql 
upgrade-pre-0.9.8.sql</computeroutput>
 <prompt>Enter password:</prompt> 
<userinput><replaceable>password</replaceable></userinput>
 <prompt>$</prompt></screen>
                 </informalexample>
-                <para>If you are upgrading from a version of Guacamole before 
0.9.10-incubating, schema changes
+                <para>If you are upgrading from a version of Guacamole before 
0.9.9, schema changes
                     which add indexes improving the performance of connection 
history searches need
                     to be applied:</para>
                 <informalexample>
-                    <screen><prompt>$</prompt> <userinput>mysql -u root -p 
<replaceable>guacamole_db</replaceable> &lt; 
schema/upgrade/upgrade-pre-0.9.10-incubating.sql</userinput>
+                    <screen><prompt>$</prompt> <userinput>mysql -u root -p 
<replaceable>guacamole_db</replaceable> &lt; 
schema/upgrade/upgrade-pre-0.9.9.sql</userinput>
+<prompt>Enter password:</prompt> 
<userinput><replaceable>password</replaceable></userinput>
+<prompt>$</prompt></screen>
+                </informalexample>
+                <para>If you are upgrading from a version of Guacamole before 
0.9.10-incubating,
+                    schema changes which add support for screen sharing and 
session affinity
+                    need to be applied:</para>
+                <informalexample>
+                    <screen><prompt>$</prompt> <userinput>mysql -u root -p 
<replaceable>guacamole_db</replaceable> &lt; 
schema/upgrade/upgrade-pre-0.9.10.sql</userinput>
 <prompt>Enter password:</prompt> 
<userinput><replaceable>password</replaceable></userinput>
 <prompt>$</prompt></screen>
                 </informalexample>
@@ -254,16 +262,18 @@ Type "help" for help.
                     directory:</para>
                 <informalexample>
                     <screen><prompt>$</prompt> <userinput>ls 
schema/upgrade/</userinput>
-<computeroutput>upgrade-pre-0.9.7.sql upgrade-pre-0.9.8.sql</computeroutput>
+<computeroutput>upgrade-pre-0.9.10.sql  upgrade-pre-0.9.8.sql
+upgrade-pre-0.9.7.sql   upgrade-pre-0.9.9.sql</computeroutput>
 <prompt>$</prompt> <userinput>psql -d <replaceable>guacamole_db</replaceable> 
-f schema/upgrade/upgrade-pre-0.9.7.sql</userinput>
 <computeroutput>ALTER TABLE
 ALTER TABLE</computeroutput>
 <prompt>$</prompt></screen>
-                    <para>If you are upgrading from a version of Guacamole 
before 0.9.8, schema
-                        changes regarding support for restricting user access 
times and concurrent
-                        connection use need to be applied:</para>
-                    <informalexample>
-                        <screen><prompt>$</prompt> <userinput>psql -d 
<replaceable>guacamole_db</replaceable> -f 
schema/upgrade/upgrade-pre-0.9.8.sql</userinput>
+                </informalexample>
+                <para>If you are upgrading from a version of Guacamole before 
0.9.8, schema
+                    changes regarding support for restricting user access 
times and concurrent
+                    connection use need to be applied:</para>
+                <informalexample>
+                    <screen><prompt>$</prompt> <userinput>psql -d 
<replaceable>guacamole_db</replaceable> -f 
schema/upgrade/upgrade-pre-0.9.8.sql</userinput>
 <computeroutput>ALTER TABLE
 ALTER TABLE
 ALTER TABLE
@@ -274,17 +284,48 @@ ALTER TABLE
 ALTER TABLE
 ALTER TABLE</computeroutput>
 <prompt>$</prompt></screen>
-                    </informalexample>
-                    <para>If you are upgrading from a version of Guacamole 
before 0.9.10-incubating, schema
-                        changes which add indexes improving the performance of 
connection history
-                        searches need to be applied:</para>
-                    <informalexample>
-                        <screen><prompt>$</prompt> <userinput>psql -d 
<replaceable>guacamole_db</replaceable> -f 
schema/upgrade/upgrade-pre-0.9.10-incubating.sql</userinput>
+                </informalexample>
+                <para>If you are upgrading from a version of Guacamole before 
0.9.9, schema
+                    changes which add indexes improving the performance of 
connection history
+                    searches need to be applied:</para>
+                <informalexample>
+                    <screen><prompt>$</prompt> <userinput>psql -d 
<replaceable>guacamole_db</replaceable> -f 
schema/upgrade/upgrade-pre-0.9.9.sql</userinput>
 <computeroutput>CREATE INDEX
 CREATE INDEX
 CREATE INDEX</computeroutput>
 <prompt>$</prompt></screen>
-                    </informalexample>
+                </informalexample>
+                <para>If you are upgrading from a version of Guacamole before
+                    0.9.10-incubating, schema changes which add support for 
screen sharing
+                    and session affinity need to be applied:</para>
+                <informalexample>
+                    <screen><prompt>$</prompt> <userinput>psql -d 
<replaceable>guacamole_db</replaceable> -f 
schema/upgrade/upgrade-pre-0.9.10.sql</userinput>
+<computeroutput>ALTER TABLE
+ALTER TABLE
+ALTER TABLE
+ALTER TABLE
+UPDATE 0
+UPDATE 0
+ALTER TABLE
+ALTER TABLE
+ALTER TABLE
+ALTER TABLE
+ALTER TABLE
+ALTER TABLE
+ALTER TABLE
+ALTER TYPE
+CREATE TABLE
+CREATE INDEX
+CREATE TABLE
+CREATE INDEX
+CREATE TABLE
+CREATE INDEX
+CREATE INDEX
+ALTER TABLE
+ALTER TABLE
+ALTER TABLE
+CREATE INDEX</computeroutput>
+<prompt>$</prompt></screen>
                 </informalexample>
             </important>
         </section>

Reply via email to