From 727948018568809018358ceffe127d3d1c030ad8 Mon Sep 17 00:00:00 2001
From: Martin Goik <goik@hdm-stuttgart.de>
Date: Sun, 23 Apr 2017 13:19:32 +0200
Subject: [PATCH] Virtualbox links
---
Doc/Sd1/gettingStarted.xml | 43 +++++++++++++++++++++++++-------------
Doc/Sda1/prerequisites.xml | 16 +++-----------
2 files changed, 32 insertions(+), 27 deletions(-)
diff --git a/Doc/Sd1/gettingStarted.xml b/Doc/Sd1/gettingStarted.xml
index e24d98c25..169e67d2c 100644
--- a/Doc/Sd1/gettingStarted.xml
+++ b/Doc/Sd1/gettingStarted.xml
@@ -169,22 +169,42 @@
<glossdef>
<para>A <productname
xlink:href="https://www.virtualbox.org">Virtualbox</productname>
- image is available at <uri
- xlink:href="ftp://mirror.mi.hdm-stuttgart.de/ubuntu/VirtualBox/mibuntu.rar">ftp://mirror.mi.hdm-stuttgart.de/ubuntu/VirtualBox/mibuntu.rar</uri>.</para>
+ <productname>Ubuntu</productname> 16.04 based image containing MI
+ added software components is available at <uri
+ xlink:href="https://mirror.mi.hdm-stuttgart.de/ubuntu/VirtualBox">https://mirror.mi.hdm-stuttgart.de/ubuntu/VirtualBox</uri>
+ in the following formats:</para>
+
+ <glosslist>
+ <glossentry>
+ <glossterm>Compressed:</glossterm>
+
+ <glossdef>
+ <para><filename>mibuntu.rar</filename> or
+ <filename>mibuntu.vdi.xz</filename></para>
+ </glossdef>
+ </glossentry>
+
+ <glossentry>
+ <glossterm>Uncompressed:</glossterm>
+
+ <glossdef>
+ <para><filename>mibuntu.vdi</filename></para>
+ </glossdef>
+ </glossentry>
+ </glosslist>
<caution>
<itemizedlist>
<listitem>
- <para><xref linkend="glo_Ftp"/> access originating from HdM
- external networks require <acronym>VPN</acronym> access. You
- may want to consider <link
- xlink:href="https://mirror.mi.hdm-stuttgart.de/ubuntu/VirtualBox/lubuntu.rar">authenticated
- https access</link> instead.</para>
+ <para><xref linkend="glo_Ftp"/> access <uri
+ xlink:href="ftp://mirror.mi.hdm-stuttgart.de/ubuntu/VirtualBox/mibuntu.rar">ftp://mirror.mi.hdm-stuttgart.de/ubuntu/VirtualBox</uri>
+ requires <acronym
+ xlink:href="https://wiki.mi.hdm-stuttgart.de/wiki/VPN">VPN</acronym>.</para>
</listitem>
<listitem>
- <para>This beast is quite big! Use a wired connection in
- favour of WiFi.</para>
+ <para>The beast is quite big! You may prefer a wired
+ connection in favour of WiFi.</para>
</listitem>
</itemizedlist>
</caution>
@@ -236,11 +256,6 @@
</listitem>
</itemizedlist>
- <para>The virtual machine is based on the <productname
- xlink:href="http://lubuntu.net">Lubuntu</productname> fork of the
- <productname xlink:href="http://www.ubuntu.com">Ubuntu</productname>
- Linux distribution for resource saving reasons.</para>
-
<para>If the VirtualBox solution does not work for you we highly
recommend a native (possibly dual boot) <orgname
xlink:href="http://www.ubuntu.com">Ubuntu</orgname> 14.04.3 <quote
diff --git a/Doc/Sda1/prerequisites.xml b/Doc/Sda1/prerequisites.xml
index 846d27f3e..b348e0882 100644
--- a/Doc/Sda1/prerequisites.xml
+++ b/Doc/Sda1/prerequisites.xml
@@ -104,20 +104,10 @@
xlink:href="http://oxygenxml.com/">Oxygenxml</productname> software
for educational (non-commercial) purposes. The corresponding key is
available at <uri
- xlink:href="ftp://mirror.mi.hdm-stuttgart.de/Firmen/Oxygen/Keys">ftp://mirror.mi.hdm-stuttgart.de/Firmen/Oxygen/Keys</uri>.</para>
+ xlink:href="https://mirror.mi.hdm-stuttgart.de/Firmen/Oxygen/Keys">https://mirror.mi.hdm-stuttgart.de/Firmen/Oxygen/Keys</uri>.</para>
<para>This license key is compatible both with the standalone and
the eclipse plugin version of the product.</para>
-
- <caution>
- <para>The license key's <abbrev
- xlink:href="https://en.wikipedia.org/wiki/File_Transfer_Protocol">ftp</abbrev>
- URL is only accessible from within the <orgname
- xlink:href="https://www.hdm-stuttgart.de">HdM</orgname> network.
- External access requires <link
- xlink:href="https://wiki.mi.hdm-stuttgart.de/wiki/VPN">Vpn
- activation</link>.</para>
- </caution>
</glossdef>
</glossentry>
@@ -187,7 +177,7 @@
using GUI based tools.</para>
<para>You may want to use the <link
- xlink:href="ftp://mirror.mi.hdm-stuttgart.de/ubuntu/VirtualBox/lubuntu.vdi">corresponding</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>
@@ -198,7 +188,7 @@
and Eclipse</title>
<para>So you like to take the hard way rather than using <link
- xlink:href="ftp://mirror.mi.hdm-stuttgart.de/ubuntu/VirtualBox/lubuntu.vdi">the
+ xlink:href="https://mirror.mi.hdm-stuttgart.de/ubuntu/VirtualBox/mibuntu.vdi">the
virtualbox image</link>? Good! Real programmers tend to complicate
things!</para>
--
GitLab