diff --git a/installparty/lumi-handout/handout-english.pdf b/installparty/lumi-handout/handout-english.pdf
index 4323ac01e48ddd0ac79ca6827109ddd351f96fad..44da05365d72878babb7b198242c6c2b70e3398b 100644
Binary files a/installparty/lumi-handout/handout-english.pdf and b/installparty/lumi-handout/handout-english.pdf differ
diff --git a/installparty/lumi-handout/handout-english.tex b/installparty/lumi-handout/handout-english.tex
index 291ed671dca3fe02dea11a50109780a634fc6842..5c606a98f744051a1f5858803ee81ba2e27db82a 100644
--- a/installparty/lumi-handout/handout-english.tex
+++ b/installparty/lumi-handout/handout-english.tex
@@ -102,11 +102,11 @@
\begin{itemize}
\item With the help of your assistant take a look at the current partition table. Free as much space as possible.
\item If you are using Windows $\geq{}$ 8 switch from \textit{Hibernate} to \textit{Shutdown}.
- \item Check for a BitLocker encryption on your windows partition.
- \begin{itemize}
- \item If you have a BitLocker encrypted disk: Make sure that you have a copy of the decryption key.
- \end{itemize}
- \item Now you can start the live system from the \lipstick{}.
+ \item Check for a BitLocker encryption on your windows partition.
+ \begin{itemize}
+ \item If you have a BitLocker encrypted disk: Make sure that you have a copy of the decryption key.
+ \end{itemize}
+ \item Now you can start the live system from the \lipstick{}.
\begin{itemize}
\item In order to improve preparation of upcoming LIPs we will collect hardware related data. If you don't want us to collect this data, select an entry “without LIPNSA”.
\item If your device is old or has low computational power, you should consider installing Xubuntu. Please discuss this with your assistant in this case. When the hardware allows for it we recommend installing Kubuntu.
@@ -125,43 +125,40 @@
\end{itemize}
\vspace{3mm}
-\begin{minipage}{0.4\textwidth}
\section{Installation}
\begin{itemize}
- \item Follow the instructions of the installer.\\ Keep in mind:
- \begin{itemize}
- \item \noindent Select \enquote{Require my password to log in}.\\ Remember your password or write it down!
- \item Tips for choosing a password:\\
- \burl{https://xkcd.com/936} and\\
- \burl{https://xkcd.com/792}
- \item You might see an error concerning disk mounting, where you should select “no”.
- \end{itemize}
-\end{itemize}
-\end{minipage}
-\begin{minipage}{0.6\textwidth}
-\vspace{1mm}
-\includegraphics[width=\textwidth]{data/battery-staple}
-\end{minipage}
-\vspace{2mm}
-\begin{itemize}
+ \item \parbox[t]{.4\textwidth-\leftmargin}{Follow the instructions of the installer.\\
+ Keep in mind:
+ \begin{itemize}
+ \item \noindent Select \enquote{Require my password to log in}. Remember your password or write it down!
+ \item Tips for choosing a password:\\
+ \burl{https://xkcd.com/936} and\\
+ \burl{https://xkcd.com/792}
+ \item You might see an error concerning disk mounting, where you should select “no”.
+ \end{itemize}
+ \vspace*{2pt}
+ }%
+ \hfill
+ \parbox[t][3cm][c]{.58\textwidth}{\includegraphics[width=.58\textwidth]{data/battery-staple}}
\item After the installation has finished, a script will lead you through the installation of some useful programs.
\begin{itemize}
- \item The Ubuntu firewall (ufw) should be enabled when prompted. Exceptions can be added later if necessary. If you have questions, ask an assistant.
+ \item The Ubuntu firewall (\emph{ufw}) should be enabled when prompted. Exceptions can be added later if necessary. If you have questions, ask an assistant.
\item If you installed Xubuntu or are unsure: Please select the programs together with an assistant.
% \item When prompted for Kerberos use the arrow-keys to choose \enquote{OK} and confirm with \tasteReturn.
\end{itemize}
- \item After the script has finished reboot the device. As soon as Linux has been stopped unplug the \lipstick{}.
- \item In case of dual-boot start Windows. You can do so by choosing the Windows entry in the boot menu and pressing \tasteReturn. Restart the device if Windows booted successfully.
- \item Start Linux. It should start by default, alternatively\\you can choose it manually in the boot menu and start\\it by pressing \tasteReturn.
+ \item After the script has finished reboot the device. As soon as Linux has been stopped unplug the \lipstick{}.
+ \item In case of dual-boot start Windows by choosing the Windows entry in the boot menu and pressing \tasteReturn.\\
+ Restart the device if Windows booted successfully.
+ \item \parbox[t]{.5\textwidth-\leftmargin}{Start Linux. It should start by default, alternatively you can choose it manually in the boot menu and start it by pressing \tasteReturn.}
\end{itemize}
\begin{minipage}{0.5\textwidth}
\textbf{Almost done!}
- You have successfully finished most of the installation. Before you leave, test all installed operating systems (Windows, Linux, OS X, \dots{}) and start configuring your newly installed Linux. For that just turn the page.
- But before you continue, get something to eat. \texttt{:)}
+ You have successfully finished most of the installation. Before you leave, test all installed operating systems (Windows, Linux, OS X, \dots{}) and start configuring your newly installed Linux. For that just turn the page.
+ But before you continue, get something to eat. \texttt{:)}
\end{minipage}
\begin{minipage}{0.5\textwidth}
-\vspace{-13mm}
-\includegraphics[width=\textwidth]{data/password-reuse}
+ \vspace{-14mm}%
+ \includegraphics[width=\textwidth]{data/password-reuse}
\end{minipage}
\vfill
@@ -169,10 +166,10 @@
\includegraphics[width=0.9\textwidth]{../../logos/alug.pdf}
\end{minipage}
\begin{minipage}{0.7\textwidth}
- \textbf{Whether you enjoy your Linux or have some problems, visit the \enquote{\alug{}} {\small (\alugurl)}!}\\
- The open \enquote{\alug{}} meeting starts at around 20:30 in the \enquote{Auf der Hörn}.
- You can simply come join us and talk to us.\\
- \textbf{All kinds of linux users are present, from beginner to expert. Everyone is welcome to join us and take part at the ALUG.}
+ \textbf{Whether you enjoy your Linux or have some problems, visit the \enquote{\alug{}} {\small (\alugurl)}!}\\
+ The open \enquote{\alug{}} meeting starts at around 20:30 in the \enquote{Auf der Hörn}.
+ You can simply come join us and talk to us.\\
+ \textbf{All kinds of linux users are present, from beginner to expert. Everyone is welcome to join us and take part at the ALUG.}
\end{minipage}
\clearpage
@@ -207,6 +204,7 @@
\end{itemize}
\end{minipage}
\begin{minipage}{0.5\textwidth}
+ \vspace{1mm}
\centering
\includegraphics[width=.78\textwidth]{data/eduroam-english}
\end{minipage}
@@ -216,27 +214,27 @@
\begin{itemize}
\item Open the File Manager via the \startmenu{}. You can put files in your home directory. There is also some documentation of already installed software.
\item If you want to access your Windows directories ask some assistant to help you set it up.
- \item Configure your system to your liking (desktop background, power management, \dots{}).
+ \item Configure your system to your liking (desktop background, power management, \dots{}).
\item Test logout, shutdown, restart, login, stand-by and hotkeys, if any (e.g. keys for volume and display brightness). Check whether the correct time is shown.
- \item Let an assistant confirm the completeness and integrity of your installation.
- \item Return your \lipstick{} and the \laufzettel{}\footnote{\laufzettelexp}. Sign out and retrieve your pledge.
- \item At \burl{https://videoag.fsmpi.rwth-aachen.de/?course=14ss-kiss} you can find recordings of previous Linux workshops where a small introduction to Linux is given.
+ \item Let an assistant confirm the completeness and integrity of your installation.
+ \item Return your \lipstick{} and the \laufzettel{}\footnote{\laufzettelexp}. Sign out and retrieve your pledge.
+ \item At \burl{https://videoag.fsmpi.rwth-aachen.de/?course=14ss-kiss} you can find recordings of previous Linux workshops where a small introduction to Linux is given.
\begin{center}
- \vspace{1em}
+ \vspace{1em}
\begin{overpic}[width=0.6\textwidth]{data/cautionary.png}
\put(15,4){\burl{https://xkcd.com/456}}
\end{overpic}
\end{center}
\vspace{.5em}
\item Configure email and instant messaging with help of the documentation in your home directory.
- \item You can use \softwarecenter{} to install additional software.
- \item Get used to using your Linux. Have fun and recommend Linux to others.
- %\item On the 25st of October at 6pm there will be KISS (\enquote{\textbf{K}ommunikation und \textbf{I}nstallation \textbf{s}chöner \textbf{S}oftware} -- \enquote{Communication and installation of awesome software}) at the Informatikzentrum. There will be presentations on how to use your Linux and Open Source Software in general.
+ \item You can use \softwarecenter{} to install additional software.
+ \item Get used to using your Linux. Have fun and recommend Linux to others.
+ %\item On the 25st of October at 6pm there will be KISS (\enquote{\textbf{K}ommunikation und \textbf{I}nstallation \textbf{s}chöner \textbf{S}oftware} -- \enquote{Communication and installation of awesome software}) at the Informatikzentrum. There will be presentations on how to use your Linux and Open Source Software in general.
\end{itemize}
\begin{center}
\mbox{Thank you for your interest on behalf of the \fachschaft{} and the \alug{}}.\\
- %We hope to see you again at the KISS!
+ %We hope to see you again at the KISS!
\end{center}
\vfill
@@ -244,8 +242,8 @@
\includegraphics[width=\textwidth]{../../logos/osak.png}
\end{minipage}
\begin{minipage}{0.7\textwidth}
- \textbf{In case of questions or feedback we are looking forward to your email to \osakmail{}.}
- If you enjoy using your Linux and want to help us out at the next LIP, ask an assistant to subscribe you to our LIP-assistant mailing list or join our OSAK-meeting. The OSAK-meeting takes place on Thursdays every second week (every even numbered week, e.g. 16.04., 30.04., \dots{}) at 8pm in room 2015 at the Informatikzentrum.
+ \textbf{In case of questions or feedback we are looking forward to your email to \osakmail{}.}
+ If you enjoy using your Linux and want to help us out at the next LIP, ask an assistant to subscribe you to our LIP-assistant mailing list or join our OSAK-meeting. The OSAK-meeting takes place on Thursdays every second week (every even numbered week, e.g. 16.04., 30.04., \dots{}) at 8pm in room 2015 at the Informatikzentrum.
\end{minipage}
\clearpage
diff --git a/installparty/lumi-handout/handout.pdf b/installparty/lumi-handout/handout.pdf
index 2917c4755ec0f9dcb7d06f8d0dc8762b7cf4f430..bf871d8dca8406fbec4f5fb8f5e4616638fe153c 100644
Binary files a/installparty/lumi-handout/handout.pdf and b/installparty/lumi-handout/handout.pdf differ
diff --git a/installparty/lumi-handout/handout.tex.template b/installparty/lumi-handout/handout.tex.template
index c9b0efd3265e15a7d4899d3ea629ab9af7474664..fa54e8148a8f4a1cef66d21654c3d317ca4ca074 100644
--- a/installparty/lumi-handout/handout.tex.template
+++ b/installparty/lumi-handout/handout.tex.template
@@ -15,7 +15,6 @@
\usepackage{breakurl}
\usepackage{tikz}
\usepackage{graphicx}
-%\usepackage{wrapfig} % TODO: improve figures, possibly use wrapfig?
\usepackage{overpic}
\usepackage{widetable}
\usepackage{keystroke}
@@ -121,44 +120,40 @@ Falls gerade kein Helfer verfügbar sein sollte, lies solange den aktuellen \tex
\end{itemize}
\vspace{3mm}
-\begin{minipage}{0.4\textwidth}
\section{Installation}
\begin{itemize}
- \item Folge dem weiteren Ablauf des Installationsprogrammes. Beachte dabei:
- \begin{itemize}
- \item Wähle \enquote{Passwort zum Anmelden abfragen}. Merke dir dein Passwort oder schreibe es auf!
- \item Tipps für dein Passwort:\\
- \burl{https://xkcd.com/936} und\\
- \burl{https://xkcd.com/792}
- \item Bei einer Fehlermeldung zum Einbinden einer Festplatte ist „nein“ auszuwählen.
- \end{itemize}
-\end{itemize}
-\end{minipage}
-\begin{minipage}{0.6\textwidth}
-%\vspace{1mm}
-\includegraphics[width=\textwidth]{data/battery-staple}
-\end{minipage}
-%\vspace{1mm}
-\begin{itemize}
+ \item \parbox[t]{.4\textwidth-\leftmargin}{Folge dem weiteren Ablauf des Installationsprogrammes. Beachte dabei:
+ \begin{itemize}
+ \item Wähle \enquote{Passwort zum Anmelden abfragen}. Merke dir dein Passwort oder schreibe es auf!
+ \item Tipps für dein Passwort:\\
+ \burl{https://xkcd.com/936} und\\
+ \burl{https://xkcd.com/792}
+ \item Bei einer Fehlermeldung zum Einbinden einer Festplatte ist „nein“ auszuwählen.
+ \end{itemize}
+ \vspace*{2pt}
+ }%
+ \hfill
+ \parbox[t][3cm][c]{.58\textwidth}{\includegraphics[width=.58\textwidth]{data/battery-staple}}
\item Wenn die Installation fertig ist, führt ein Skript durch die Installation häufig verwendeter Programme. Beachte dabei:
\begin{itemize}
- \item Die Ubuntu Firewall (ufw) sollte aktiviert werden, um den Rechner abzusichern. Wenn nötig können später Ausnahmeregeln hinzugefügt werden. Bei Fragen wende dich an einen Helfer.
+ \item Die Ubuntu Firewall (\emph{ufw}) sollte aktiviert werden, um den Rechner abzusichern. Wenn nötig können später Ausnahmeregeln hinzugefügt werden. Bei Fragen wende dich an einen Helfer.
\item Falls du Xubuntu installiert hast oder unsicher bist: Wählen die Programme zusammen mit einem Helfer aus.
%\item Falls nach Kerberos gefragt wird, mit den Pfeil-\\tasten \enquote{Ok} auswählen und mit \tasteReturn bestätigen.
\end{itemize}
\item Schalte den Rechner nach dem Installieren der Pakete aus. Sobald Linux beendet wurde, ziehe den \lipstick{} heraus.
- \item Falls du Windows hast („Dual-Boot“), starte zunächst dieses. Wähle es dazu im Menü aus und drücke \tasteReturn.\\
+ \item Falls du Windows hast (Dual-Boot), starte zunächst dieses. Wähle es dazu im Menü aus und drücke \tasteReturn.\\
Wenn es funktioniert, starte neu.
- \item Starte Linux. Wähle es dazu im Menü aus und drücke \tasteReturn. Alternativ wird es nach kurzer Zeit automatisch starten.
+ \item \parbox[t]{.5\textwidth-\leftmargin}{Starte Linux. Wähle es dazu im Menü aus und bestätige mit \tasteReturn. Alternativ wird es nach kurzer Zeit automatisch starten.}
\end{itemize}
+\vspace{3mm}
\begin{minipage}{0.5\textwidth}
\textbf{Fast geschafft!}\\
Du bist jetzt mit dem Großteil der Installation durch. Bevor du nach Hause gehst, teste, ob alle installierten Betriebssysteme (Windows, Linux, OS X, \dots{}) richtest du dein Linux noch grundlegend ein. Blätter dazu einfach um.\\
Aber bevor du vertieft weitermachst, hol dir doch erstmal etwas zu essen. \texttt{:)}
\end{minipage}
\begin{minipage}{0.5\textwidth}
-%\vspace{-13mm}
-\includegraphics[width=\textwidth]{data/password-reuse}
+ \vspace{-14mm}
+ \includegraphics[width=\textwidth]{data/password-reuse}
\end{minipage}
\vfill
@@ -189,8 +184,9 @@ Falls gerade kein Helfer verfügbar sein sollte, lies solange den aktuellen \tex
\end{itemize}
\end{itemize}
+\vspace{3mm}
+\begin{minipage}{0.55\textwidth}
\subsection{Drahtloses Netzwerk (WLAN)}
-\begin{minipage}{0.5\textwidth}
\begin{itemize}
\item Rufe \burl{https://www.rwth-aachen.de/eduroam} auf und melde dich mit deiner TIM-Kennung und deinem Passwort an.
\item Generiere dir dort WLAN-Zugangsdaten an, die du gleich benötigst.
@@ -203,12 +199,13 @@ Falls gerade kein Helfer verfügbar sein sollte, lies solange den aktuellen \tex
\end{itemize}
\end{itemize}
\end{minipage}
-\begin{minipage}{0.5\textwidth}
+\begin{minipage}{0.45\textwidth}
\centering
- \includegraphics[width=.85\textwidth]{data/eduroam}
+ \includegraphics[width=.95\textwidth]{data/eduroam}
+ \vspace*{-2mm}
\end{minipage}
-%\vspace{-2mm}
+\vspace{3mm}
\section{Dein Linux benutzen}
\begin{itemize}
\item Öffne den Dateimanager per \startmenu{}. In deinem Benutzerverzeichnis kannst du Dateien ablegen. Außerdem findest du dort eine kleine Dokumentation über einige der bereits installierten Software.
@@ -251,7 +248,6 @@ Falls gerade kein Helfer verfügbar sein sollte, lies solange den aktuellen \tex
\clearpage
\lhead{\laufzettel{}}
-% What does this do?
\begin{tikzpicture}[draw,fill,remember picture,overlay,line width=5cm,every node/.style={inner sep=0,outer sep=0}]
\node (upnode) at ([xshift=2.5cm,yshift=0cm]current page.north west) { };
\node (leftnode) at ([xshift=0cm,yshift=-2.5cm]current page.north west) { };