From 61c65f955bff764a631f379725a8fb6cf45fd0b7 Mon Sep 17 00:00:00 2001
From: Martin Goik <goik@hdm-stuttgart.de>
Date: Sun, 25 Mar 2018 18:25:49 +0200
Subject: [PATCH] Virtualbox link, missing intern ref
---
Doc/Sd1/gettingStarted.xml | 9 ++-------
Doc/Sda1/jdbc.xml | 9 ++++-----
Doc/Sda1/prerequisites.xml | 12 ++++++------
Doc/Sda1/xmlschema.xml | 3 ++-
Doc/Sda1/xslt.xml | 8 ++++----
Klausuren/Sda1/2017winter/Solve/.gitignore | 2 +-
6 files changed, 19 insertions(+), 24 deletions(-)
diff --git a/Doc/Sd1/gettingStarted.xml b/Doc/Sd1/gettingStarted.xml
index a02b2d316..77663277e 100644
--- a/Doc/Sd1/gettingStarted.xml
+++ b/Doc/Sd1/gettingStarted.xml
@@ -197,13 +197,8 @@
native (dual boot) installation</title>
<para>A <trademark
- xlink:href="https://www.virtualbox.org">Virtualbox</trademark> <link
- xlink:href="https://mirror.mi.hdm-stuttgart.de/ubuntu/VirtualBox">Linux
- image with MI supplements</link> as <filename
- xlink:href="https://mirror.mi.hdm-stuttgart.de/ubuntu/VirtualBox/mibuntu.rar">mibuntu.rar</filename>
- (compressed) or <filename
- xlink:href="https://mirror.mi.hdm-stuttgart.de/ubuntu/VirtualBox/mibuntu.vdi">mibuntu.vdi</filename>
- (uncompressed)</para>
+ xlink:href="https://www.virtualbox.org">Virtualbox </trademark> image mibuntu.vdi provided by compressed <link
+ xlink:href="https://mirror.mi.hdm-stuttgart.de/ubuntu/VirtualBox"> rar archives</link>.</para>
<caution>
<itemizedlist>
diff --git a/Doc/Sda1/jdbc.xml b/Doc/Sda1/jdbc.xml
index 8bb0ef8c3..be74c9429 100644
--- a/Doc/Sda1/jdbc.xml
+++ b/Doc/Sda1/jdbc.xml
@@ -791,17 +791,16 @@ mysql-proxy 6446/udp</screen>
xlink:href="https://docs.oracle.com/javase/9/docs/api/java/sql/Connection.html">java.sql.Connection</classname>,
<classname
xlink:href="https://docs.oracle.com/javase/9/docs/api/java/sql/Statement.html">java.sql.Statement</classname>
- and friens will be created during the bootstrap process starting
- from <classname
+ and friends will be created during the bootstrap process
+ starting from <classname
xlink:href="https://docs.oracle.com/javase/9/docs/api/java/sql/DriverManager.html">java.sql.DriverManager</classname>.</para>
</answer>
</qandaentry>
</qandadiv>
</qandaset>
- <para>So how does it actually work with respect to coding? You may want
- to read <xref linkend="toolingConfigJdbc"/> before starting your
- exercises. We first prepare a database table:</para>
+ <para>So how does it actually work with respect to coding? We first
+ prepare a database table:</para>
<figure xml:id="figSchemaPerson">
<title><code>Person</code> table</title>
diff --git a/Doc/Sda1/prerequisites.xml b/Doc/Sda1/prerequisites.xml
index 102168c6a..35389007b 100644
--- a/Doc/Sda1/prerequisites.xml
+++ b/Doc/Sda1/prerequisites.xml
@@ -157,11 +157,7 @@
well. For the latter some command line hints may have to be replaced by
using GUI based tools.</para>
- <para>You may want to use the <link
- xlink:href="https://mirror.mi.hdm-stuttgart.de/ubuntu/VirtualBox/mibuntu.vdi">corresponding</link>
- <link xlink:href="https://www.virtualbox.org">Virtualbox image</link>
- containing a complete system avoiding installation hassles. This should
- work well one reasonable current hardware systems.</para>
+ <para>You may want to consider using either of MI VirtualBox or VMware image, see <xref linkend="sd1_fig_VirtualboxImage"/> for details.</para>
<section xml:id="eclipse">
<title><productname
@@ -169,7 +165,7 @@
and IntelliJ IDEA</title>
<para>So you like to take the hard way rather than using <link
- xlink:href="https://mirror.mi.hdm-stuttgart.de/ubuntu/VirtualBox/mibuntu.vdi">the
+ xlink:href="https://mirror.mi.hdm-stuttgart.de/ubuntu/VirtualBox">the
virtualbox image</link>? Good! Real programmers tend to complicate
things!</para>
@@ -185,6 +181,10 @@
<para>Certain functionalities may not be provided</para>
</listitem>
+ <listitem>
+ <para>These tools are (most likely!) not on offer during the E-examination.</para>
+ </listitem>
+
<listitem>
<para><orgname>HdM</orgname> staff support in case of troubles will
be limited to coding excluding tool support. In other words: You are
diff --git a/Doc/Sda1/xmlschema.xml b/Doc/Sda1/xmlschema.xml
index c98b7b7eb..281225320 100644
--- a/Doc/Sda1/xmlschema.xml
+++ b/Doc/Sda1/xmlschema.xml
@@ -3914,7 +3914,8 @@ public class Memo {
</qandadiv>
</qandaset>
- <qandaset defaultlabel="qanda" xml:id="example_book.dtd_v5">
+ <qandaset defaultlabel="qanda"
+ xml:id="sda1_xmlschema_qandaset_bookFinal">
<title>Supporting <tag class="starttag">table</tag> and internal
references in <filename>book.xsd</filename>.</title>
diff --git a/Doc/Sda1/xslt.xml b/Doc/Sda1/xslt.xml
index 5c6eb893e..0575855da 100644
--- a/Doc/Sda1/xslt.xml
+++ b/Doc/Sda1/xslt.xml
@@ -1657,10 +1657,10 @@ you need some </emphasis><em>time</em><emphasis role="bold">.</empha
<qandadiv>
<qandaentry>
<question>
- <para>In <xref linkend="sda1SectSetInternRef"/> we constructed a
- schema allowing itemized lists and mixed content for <tag
- class="starttag">book</tag> instances. This schema also allowed
- to define <tag class="starttag">emphasis</tag>, <tag
+ <para>In <xref linkend="sda1_xmlschema_qandaset_bookFinal"/> we
+ constructed a schema allowing itemized lists and mixed content
+ for <tag class="starttag">book</tag> instances. This schema also
+ allowed to define <tag class="starttag">emphasis</tag>, <tag
class="starttag">table</tag> and <tag
class="starttag">link</tag> elements being part of a mixed
content definition. Extend the current book2html.xsl to account
diff --git a/Klausuren/Sda1/2017winter/Solve/.gitignore b/Klausuren/Sda1/2017winter/Solve/.gitignore
index 3498d4a33..6f9e47626 100644
--- a/Klausuren/Sda1/2017winter/Solve/.gitignore
+++ b/Klausuren/Sda1/2017winter/Solve/.gitignore
@@ -1,4 +1,4 @@
/.classpath
/.project
A1.log
-
+/.idea
--
GitLab