From ffebee158df28fdc30686139257fb8f7cdfae49f Mon Sep 17 00:00:00 2001
From: "J.F.J. Laros" <j.f.j.laros@lumc.nl>
Date: Sat, 15 Mar 2014 20:28:27 +0100
Subject: [PATCH] Adapted the basics lecture for the presentation-pics
submodule.
---
basics/OS_evolution.jpg | 1 +
basics/OS_placement.svg | 1 +
basics/Windows1.0.png | 1 -
basics/Windows1_0.png | 1 +
basics/basics.tex | 28 ++++++++++++++--------------
basics/linux-osxlike.jpg | 1 +
basics/linux-windowslike.jpg | 1 +
presentation | 2 +-
presentation-pics | 2 +-
9 files changed, 21 insertions(+), 17 deletions(-)
create mode 120000 basics/OS_evolution.jpg
create mode 120000 basics/OS_placement.svg
delete mode 120000 basics/Windows1.0.png
create mode 120000 basics/Windows1_0.png
create mode 120000 basics/linux-osxlike.jpg
create mode 120000 basics/linux-windowslike.jpg
diff --git a/basics/OS_evolution.jpg b/basics/OS_evolution.jpg
new file mode 120000
index 0000000..421c917
--- /dev/null
+++ b/basics/OS_evolution.jpg
@@ -0,0 +1 @@
+../presentation-pics/pics/OS_evolution.jpg
\ No newline at end of file
diff --git a/basics/OS_placement.svg b/basics/OS_placement.svg
new file mode 120000
index 0000000..f0c1650
--- /dev/null
+++ b/basics/OS_placement.svg
@@ -0,0 +1 @@
+../presentation-pics/pics/OS_placement.svg
\ No newline at end of file
diff --git a/basics/Windows1.0.png b/basics/Windows1.0.png
deleted file mode 120000
index 2ffe5a7..0000000
--- a/basics/Windows1.0.png
+++ /dev/null
@@ -1 +0,0 @@
-../presentation-pics/pics/Windows1.0.png
\ No newline at end of file
diff --git a/basics/Windows1_0.png b/basics/Windows1_0.png
new file mode 120000
index 0000000..8dfadf2
--- /dev/null
+++ b/basics/Windows1_0.png
@@ -0,0 +1 @@
+../presentation-pics/pics/Windows1_0.png
\ No newline at end of file
diff --git a/basics/basics.tex b/basics/basics.tex
index 0ff19b2..cefafcd 100644
--- a/basics/basics.tex
+++ b/basics/basics.tex
@@ -37,7 +37,7 @@
\begin{minipage}[t]{0.48\textwidth}
\begin{figure}
\begin{center}
- \includegraphics[height=0.8\textheight]{pics/placement}
+ \includegraphics[height=0.8\textheight]{OS_placement}
\end{center}
\caption{Operating systems.}
\end{figure}
@@ -61,7 +61,7 @@
\begin{minipage}[t]{0.48\textwidth}
\begin{figure}[]
\begin{center}
- \includegraphics[width=\textwidth]{pics/Mz80k}
+ \includegraphics[width=\textwidth]{Mz80k}
\end{center}
\caption{Sharp MZ-80K.}
\label{}
@@ -71,7 +71,7 @@
\begin{minipage}[t]{0.48\textwidth}
\begin{figure}[]
\begin{center}
- \includegraphics[width=0.6\textwidth]{pics/Tdkc60cassette}
+ \includegraphics[width=0.6\textwidth]{Tdkc60cassette}
\end{center}
\caption{Cassette tape.}
\label{}
@@ -91,7 +91,7 @@
\begin{minipage}[t]{0.48\textwidth}
\begin{figure}[]
\begin{center}
- \includegraphics[width=\textwidth]{pics/772px-Amiga500_system}
+ \includegraphics[width=\textwidth]{Amiga500}
\end{center}
\caption{Commodore Amiga 500.}
\label{}
@@ -101,7 +101,7 @@
\begin{minipage}[t]{0.48\textwidth}
\begin{figure}[]
\begin{center}
- \includegraphics[width=\textwidth]{pics/800px-Floppy_disk_2009_G1}
+ \includegraphics[width=\textwidth]{Floppy_disk}
\end{center}
\caption{Floppy disks and diskettes.}
\label{}
@@ -116,7 +116,7 @@
\begin{figure}[]
\begin{center}
- \includegraphics[width=0.8\textwidth]{pics/FreeDOS}
+ \includegraphics[width=0.8\textwidth]{FreeDOS}
\end{center}
\caption{FreeDOS.}
\label{}
@@ -128,7 +128,7 @@
\begin{figure}[]
\begin{center}
- \includegraphics[height=0.8\textheight]{pics/evolution}
+ \includegraphics[height=0.8\textheight]{OS_evolution}
\end{center}
\caption{The operating system family tree.}
\label{}
@@ -162,11 +162,11 @@
\begin{figure}[]
\begin{center}
\includegraphics[width=\textwidth, height=0.4\textheight]
- {pics/Windows1_0}
+ {Windows1_0}
\medskip
\includegraphics[width=\textwidth, height=0.4\textheight]
- {pics/Windows_95_Desktop_screenshot}
+ {Windows95}
\end{center}
\caption{Older versions.}
\label{}
@@ -196,7 +196,7 @@
\begin{minipage}[t]{0.48\textwidth}
\begin{figure}[]
\begin{center}
- \includegraphics[width=\textwidth]{pics/Windows8}
+ \includegraphics[width=\textwidth]{Windows8}
\end{center}
\caption{Windows 8.1.}
\label{}
@@ -221,7 +221,7 @@
\begin{figure}[]
\begin{center}
\includegraphics[width=\textwidth, height=0.4\textheight]
- {pics/Osx-mavericks-screenshot}
+ {OSX-mavericks}
\end{center}
\caption{OS X.}
\label{}
@@ -245,11 +245,11 @@
\begin{figure}[]
\begin{center}
\includegraphics[width=\textwidth, height=0.4\textheight]
- {pics/linux_desktop_1}
+ {linux-osxlike}
\medskip
\includegraphics[width=\textwidth, height=0.4\textheight]
- {pics/linux_desktop_2}
+ {linux-windowslike}
\end{center}
\caption{Different flavours.}
\label{}
@@ -271,7 +271,7 @@
\begin{figure}[]
\begin{center}
- \includegraphics[width=0.8\textwidth]{pics/mac-vs-pc-585x230}
+ \includegraphics[width=0.8\textwidth]{mac-vs-pc}
\end{center}
\caption{Mac vs. PC.}
\label{}
diff --git a/basics/linux-osxlike.jpg b/basics/linux-osxlike.jpg
new file mode 120000
index 0000000..9ac4093
--- /dev/null
+++ b/basics/linux-osxlike.jpg
@@ -0,0 +1 @@
+../presentation-pics/pics/linux-osxlike.jpg
\ No newline at end of file
diff --git a/basics/linux-windowslike.jpg b/basics/linux-windowslike.jpg
new file mode 120000
index 0000000..13f8d46
--- /dev/null
+++ b/basics/linux-windowslike.jpg
@@ -0,0 +1 @@
+../presentation-pics/pics/linux-windowslike.jpg
\ No newline at end of file
diff --git a/presentation b/presentation
index fbff0b7..ccb6d11 160000
--- a/presentation
+++ b/presentation
@@ -1 +1 @@
-Subproject commit fbff0b71681578bcb479b24e8e6d3989d0573cd0
+Subproject commit ccb6d1119e26bc1d89ed6b53dfceca1a937a1bd6
diff --git a/presentation-pics b/presentation-pics
index 3751e43..0287014 160000
--- a/presentation-pics
+++ b/presentation-pics
@@ -1 +1 @@
-Subproject commit 3751e43688f34f70c88c1542ea9422ec37c1a814
+Subproject commit 0287014d5a52be79d711108af63b8dc50ff2aa54
--
GitLab