From 70d582edb38761a2cc253bc4a8d9ace015f26b5e Mon Sep 17 00:00:00 2001
From: Martin Goik <goik@hdm-stuttgart.de>
Date: Sun, 16 Nov 2014 23:31:25 +0100
Subject: [PATCH] Glossentries
---
Sd1/swd1.xml | 24 ++++++++++++++----------
glossary.xml | 10 ++++++++++
2 files changed, 24 insertions(+), 10 deletions(-)
diff --git a/Sd1/swd1.xml b/Sd1/swd1.xml
index 2751d9f2b..48ace6052 100644
--- a/Sd1/swd1.xml
+++ b/Sd1/swd1.xml
@@ -37,7 +37,8 @@
</glossentry>
<glossentry>
- <glossterm><acronym>VPN</acronym> Installation</glossterm>
+ <glossterm><acronym>MI <xref linkend="glo_VPN"/></acronym>
+ Installation</glossterm>
<glossdef>
<para>OpenVPN <acronym>wiki</acronym> <link
@@ -60,7 +61,8 @@
</glossentry>
<glossentry>
- <glossterm>MI git/svn repository</glossterm>
+ <glossterm>MI <xref linkend="glo_Git"/> / <xref linkend="glo_Svn"/>
+ repository</glossterm>
<glossdef>
<para><link
@@ -91,7 +93,6 @@
<glossentry>
<glossterm>Books / Literature</glossterm>
-
<glossdef>
<itemizedlist>
<listitem>
@@ -817,7 +818,8 @@
<itemizedlist>
<listitem>
- <para>Read chapter 2 of <xref linkend="bib_Koelling2010Ger"/>.</para>
+ <para>Read chapter 2 of <xref
+ linkend="bib_Koelling2010Ger"/>.</para>
</listitem>
<listitem>
@@ -2151,7 +2153,8 @@ long sum = (long)a + b;</programlisting>
</listitem>
<listitem>
- <para>Read chapter 4 of <xref linkend="bib_Koelling2010Ger"/>.</para>
+ <para>Read chapter 4 of <xref
+ linkend="bib_Koelling2010Ger"/>.</para>
</listitem>
</itemizedlist>
</section>
@@ -4929,8 +4932,8 @@ sin(4 * PI)=4518.2187229323445, difference=4518.2187229323445</programlisting>
<section xml:id="sd1ArrayPrepare">
<title>Preparations</title>
- <para>Chapter 4 <xref linkend="bib_Horton2011"/> excluding <quote>Mutable
- Strings</quote>.</para>
+ <para>Chapter 4 <xref linkend="bib_Horton2011"/> excluding
+ <quote>Mutable Strings</quote>.</para>
</section>
<section xml:id="sd1ArrayiExercise">
@@ -7188,9 +7191,9 @@ final BufferedReader inputBufferedReader = new BufferedReader(fileReader);</prog
<section xml:id="sd1CollectionsPrep">
<title>Preparations</title>
- <para>Chapter 14 of <xref linkend="bib_Horton2011"/> provides an in depth
- discussion of Java collections. Regarding the upcoming exercises you may
- however prefer to study the following track:</para>
+ <para>Chapter 14 of <xref linkend="bib_Horton2011"/> provides an in
+ depth discussion of Java collections. Regarding the upcoming exercises
+ you may however prefer to study the following track:</para>
<glosslist>
<glossentry>
@@ -8772,5 +8775,6 @@ D: Jane Simmonds, Tim Bone</programlisting>
</chapter>
<xi:include href="../glossary.xml" xpointer="element(/1)"/>
+
<xi:include href="../bibliography.xml" xpointer="element(/1)"/>
</part>
diff --git a/glossary.xml b/glossary.xml
index d5ec77d1f..7bcaaa3c0 100644
--- a/glossary.xml
+++ b/glossary.xml
@@ -384,6 +384,16 @@
</glossdef>
</glossentry>
+ <glossentry xml:id="glo_VPN">
+ <glossterm><acronym>VPN</acronym></glossterm>
+
+ <glossdef>
+ <para><link
+ xlink:href="http://en.wikipedia.org/wiki/Virtual_private_network">Virtual
+ Private Network</link></para>
+ </glossdef>
+ </glossentry>
+
<glossentry xml:id="glo_W3C">
<glossterm><orgname>W3C</orgname></glossterm>
--
GitLab