diff --git a/basics/OS_evolution.jpg b/basics/OS_evolution.jpg new file mode 120000 index 0000000000000000000000000000000000000000..421c91790c794f0a2f464f5302093a946131525b --- /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 0000000000000000000000000000000000000000..f0c1650c82b90ff6741f892fc49c120a0e9e9db1 --- /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 2ffe5a717f0119e136583fb251cefa5cae4cbf4c..0000000000000000000000000000000000000000 --- 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 0000000000000000000000000000000000000000..8dfadf23cae1ad0af052f3db788808dc4b24a905 --- /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 0ff19b2f21a2e91730fbb93637123f0de75ce015..cefafcd31166b9d192dd54c69e1916e1bc03ed89 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 0000000000000000000000000000000000000000..9ac40932c4dd7dc422d0fb182acab465bff1c59d --- /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 0000000000000000000000000000000000000000..13f8d46375af4344c8ba66ad443ae46b8272ba36 --- /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 fbff0b71681578bcb479b24e8e6d3989d0573cd0..ccb6d1119e26bc1d89ed6b53dfceca1a937a1bd6 160000 --- a/presentation +++ b/presentation @@ -1 +1 @@ -Subproject commit fbff0b71681578bcb479b24e8e6d3989d0573cd0 +Subproject commit ccb6d1119e26bc1d89ed6b53dfceca1a937a1bd6 diff --git a/presentation-pics b/presentation-pics index 3751e43688f34f70c88c1542ea9422ec37c1a814..0287014d5a52be79d711108af63b8dc50ff2aa54 160000 --- a/presentation-pics +++ b/presentation-pics @@ -1 +1 @@ -Subproject commit 3751e43688f34f70c88c1542ea9422ec37c1a814 +Subproject commit 0287014d5a52be79d711108af63b8dc50ff2aa54