You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@guacamole.apache.org by vn...@apache.org on 2018/01/01 22:07:00 UTC
[2/3] guacamole-manual git commit: GUACAMOLE-423: Reword database
upgrade documentation,
removing the list of all current upgrade scripts which tends to change each
release.
GUACAMOLE-423: Reword database upgrade documentation, removing the list of all current upgrade scripts which tends to change each release.
Project: http://git-wip-us.apache.org/repos/asf/guacamole-manual/repo
Commit: http://git-wip-us.apache.org/repos/asf/guacamole-manual/commit/81b4f571
Tree: http://git-wip-us.apache.org/repos/asf/guacamole-manual/tree/81b4f571
Diff: http://git-wip-us.apache.org/repos/asf/guacamole-manual/diff/81b4f571
Branch: refs/heads/staging/0.9.14
Commit: 81b4f57124c0dc0778ee06bfe9428dda61f55942
Parents: c814bd6
Author: Michael Jumper <mj...@apache.org>
Authored: Mon Jan 1 13:52:56 2018 -0800
Committer: Michael Jumper <mj...@apache.org>
Committed: Mon Jan 1 13:52:56 2018 -0800
----------------------------------------------------------------------
src/chapters/jdbc-auth.xml | 33 ++++++++++-----------------------
1 file changed, 10 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/guacamole-manual/blob/81b4f571/src/chapters/jdbc-auth.xml
----------------------------------------------------------------------
diff --git a/src/chapters/jdbc-auth.xml b/src/chapters/jdbc-auth.xml
index dc9ebc2..66c8c09 100644
--- a/src/chapters/jdbc-auth.xml
+++ b/src/chapters/jdbc-auth.xml
@@ -227,20 +227,13 @@ Type 'help;' or '\h' for help. Type '\c' to clear the current input statement.
is named <filename>upgrade-pre-<replaceable>VERSION</replaceable>.sql</filename>
where <replaceable>VERSION</replaceable> is the version of Guacamole where those
changes were introduced. They need to be run when you are upgrading from a
- version of Guacamole older than <replaceable>VERSION</replaceable>:</para>
- <informalexample>
- <screen><prompt>$</prompt> <userinput>ls schema/upgrade/</userinput>
-<computeroutput>upgrade-pre-0.8.2.sql upgrade-pre-0.9.13.sql upgrade-pre-0.9.8.sql
-upgrade-pre-0.9.10.sql upgrade-pre-0.9.6.sql upgrade-pre-0.9.9.sql
-upgrade-pre-0.9.11.sql upgrade-pre-0.9.7.sql</computeroutput>
-<prompt>$</prompt></screen>
- </informalexample>
+ version of Guacamole older than <replaceable>VERSION</replaceable>.</para>
<para>These scripts are incremental and, when relevant, <emphasis>must be run in
order</emphasis>. For example, if you are upgrading an existing database
- from version 0.9.10-incubating, you would need to run the
- <filename>upgrade-pre-0.9.11.sql</filename> script (because 0.9.10 is older
- than 0.9.11), followed by the <filename>upgrade-pre-0.9.13.sql</filename> script
- (because 0.9.10 is also older than 0.9.13):</para>
+ from version 0.9.10-incubating to version 0.9.13-incubating, you would need to
+ run the <filename>upgrade-pre-0.9.11.sql</filename> script (because 0.9.10 is
+ older than 0.9.11), followed by the <filename>upgrade-pre-0.9.13.sql</filename>
+ script (because 0.9.10 is also older than 0.9.13):</para>
<informalexample>
<screen><prompt>$</prompt> <userinput>mysql -u root -p <replaceable>guacamole_db</replaceable> < schema/upgrade/upgrade-pre-0.9.11.sql</userinput>
<prompt>Enter password:</prompt> <userinput><replaceable>password</replaceable></userinput>
@@ -301,19 +294,13 @@ Type "help" for help.
<filename>upgrade-pre-<replaceable>VERSION</replaceable>.sql</filename>
where <replaceable>VERSION</replaceable> is the version of Guacamole where those
changes were introduced. They need to be run when you are upgrading from a
- version of Guacamole older than <replaceable>VERSION</replaceable>:</para>
- <informalexample>
- <screen><prompt>$</prompt> <userinput>ls schema/upgrade/</userinput>
-<computeroutput>upgrade-pre-0.9.10.sql upgrade-pre-0.9.13.sql upgrade-pre-0.9.8.sql
-upgrade-pre-0.9.11.sql upgrade-pre-0.9.7.sql upgrade-pre-0.9.9.sql</computeroutput>
-<prompt>$</prompt></screen>
- </informalexample>
+ version of Guacamole older than <replaceable>VERSION</replaceable>.</para>
<para>These scripts are incremental and, when relevant, <emphasis>must be run in
order</emphasis>. For example, if you are upgrading an existing database
- from version 0.9.10-incubating, you would need to run the
- <filename>upgrade-pre-0.9.11.sql</filename> script (because 0.9.10 is older
- than 0.9.11), followed by the <filename>upgrade-pre-0.9.13.sql</filename> script
- (because 0.9.10 is also older than 0.9.13):</para>
+ from version 0.9.10-incubating to version 0.9.13-incubating, you would need to
+ run the <filename>upgrade-pre-0.9.11.sql</filename> script (because 0.9.10 is
+ older than 0.9.11), followed by the <filename>upgrade-pre-0.9.13.sql</filename>
+ script (because 0.9.10 is also older than 0.9.13):</para>
<informalexample>
<screen><prompt>$</prompt> <userinput>psql -d <replaceable>guacamole_db</replaceable> -f schema/upgrade/upgrade-pre-0.9.11.sql</userinput>
<computeroutput>ALTER TABLE