diff --git a/install_guide_updated/chapters/10_Introduction.tex b/install_guide_updated/chapters/10_Introduction.tex
index c38489832e2fdf05c756f99f413a743ed0219ab7..1376f0c958e4ebde5d35df96a5a5efd3fd81549e 100644
--- a/install_guide_updated/chapters/10_Introduction.tex
+++ b/install_guide_updated/chapters/10_Introduction.tex
@@ -27,30 +27,27 @@
\subsubsection{Ubuntu}
- Ubuntu is the most well-known GNU/Linux distribution and is a very common choice among beginners. It's designed to be super user-friendly with a nice (but unique) user interface. Ubuntu (at our install events) comes in two versions:
+ Ubuntu is the most well-known GNU/Linux distribution and is a very common choice among beginners. It's designed to be super user-friendly with a nice (but unique) user interface. At our instal events, we will only install Ubuntu 22.04, as this is both the newest version and an LTS (long term support).\par\smallskip
- \begin{itemize}
- \item 20.04 LTS: This LTS (long-term support) version is what you should pick if you're unsure. The software on this version is very well tested, and thus has the best chance to run without any problems. However, some applications (and, importantly: the kernel) are a bit dated: It is possible that new laptops (say, newer than 1 year) will probably have some issues with some hardware.
- \item 21.10: This non-LTS version released a few days ago, and has in general an updated user interface and newer software versions. It has been tested less, but works better for new hardware.
- \end{itemize}
+ Note that if your laptop is a very recent model (less than, say, 8 Months), it is usually a better idea to install Fedora, as the drivers and kernel are newer and thus support your hardware better.
\begin{figure}[ht]
\begin{subfigure}{.5\linewidth}
- \includegraphics[width=\linewidth]{../include/images/ubuntu_2004_desktop.png}
- \caption{Ubuntu 20.04 LTS}
+ \includegraphics[width=\linewidth]{../include/images/ubuntu_2204_desktop.png}
+ \caption{Desktop View}
\end{subfigure}
\begin{subfigure}{.5\linewidth}
- \includegraphics[width=\linewidth]{../include/images/ubuntu_2110_desktop.png}
- \caption{Ubuntu 21.10}
+ \includegraphics[width=\linewidth]{../include/images/ubuntu_2204_activities.png}
+ \caption{Applications View}
\end{subfigure}
- \caption{Screenshots of the Ubuntu Desktop}
+ \caption{Screenshots of the Ubuntu 22.04 LTS Desktop}
\end{figure}
\subsubsection{Fedora}
Fedora is a distribution with focus on both new software versions and free
and open source software. It is, however, easy to add repositories to also
- use proprietary software (via flatpak). As the software is very new, this
+ use proprietary software (via flatpak and rpmfusion). As the software is very new, this
distribution is especially suited for new hardware. \par\smallskip
If you use a M1 MacBook, we strongly recommend to use fedora, is it has the
@@ -60,12 +57,12 @@
\begin{figure}[ht]
\begin{subfigure}{.5\linewidth}
- \includegraphics[width=\linewidth]{../include/images/fedora_desktop.png}
- \caption{Fedora 34 Desktop}
+ \includegraphics[width=\linewidth]{../include/images/fedora_36_desktop.png}
+ \caption{Fedora 36 Desktop}
\end{subfigure}
\begin{subfigure}{.5\linewidth}
- \includegraphics[width=\linewidth]{../include/images/fedora_activities.png}
- \caption{Fedora 34 Applications View}
+ \includegraphics[width=\linewidth]{../include/images/fedora_36_activities.png}
+ \caption{Fedora 36 Applications View}
\end{subfigure}
\caption{Screenshots of the Fedora Desktop}
\end{figure}
diff --git a/install_guide_updated/chapters/20_Partitioning.pdf b/install_guide_updated/chapters/20_Partitioning.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..832e04dee6da575d09821eba19325d1797fad398
Binary files /dev/null and b/install_guide_updated/chapters/20_Partitioning.pdf differ
diff --git a/install_guide_updated/chapters/20_Partitioning.tex b/install_guide_updated/chapters/20_Partitioning.tex
index dd51443c9ff249cbbcce8886068b663b96ff1073..432802d024f230db7553df6a00de465a97697a81 100644
--- a/install_guide_updated/chapters/20_Partitioning.tex
+++ b/install_guide_updated/chapters/20_Partitioning.tex
@@ -24,6 +24,8 @@
\subsection{Windows}
+ First, we'll have to make sure that bitlocker is not activated on your windows system, as this can result in data loss. To check this, open your file manager and go to \enquote{my computer}. There, right click your Windows drive (usually \texttt{C:}) and look for an option like \enquote{disable bitlocker}. If bitlocker isn't mentioned at all, your machine does not have bitlocker on it.\par\bigskip
+
Start your Windows. After being logged in, press \keys{\OSwin + R} and type
\texttt{diskmgmt.msc} to open Disk Management. In here, you can see all the
partitions which, together, form your windows system. Now, you'll have to
@@ -37,7 +39,7 @@
\includegraphics[width=\linewidth]{../include/images/diskmgmt.png}
\end{minipage}
\begin{minipage}{.33\linewidth}
- \caption{asdf}
+ \caption{Disk Management Software of Windows 10.}
\end{minipage}
\end{figure}
@@ -74,7 +76,7 @@
\includegraphics[width=\linewidth]{../include/images/mac_partitioned.png}
\caption{Partitioning}
\end{subfigure}
- \caption{Screenshots of the \enquote{Disk Utility} application on MacOS Bug
+ \caption{Screenshots of the \enquote{Disk Utility} application on MacOS Big
Sur}
\end{figure}
diff --git a/install_guide_updated/chapters/30_Booting.tex b/install_guide_updated/chapters/30_Booting.tex
index 4968f65ff1807d6be4a600f56f61bbdda34507ed..8e2abd94f7df0d602e3283ab6bf8bd458e33f8e0 100644
--- a/install_guide_updated/chapters/30_Booting.tex
+++ b/install_guide_updated/chapters/30_Booting.tex
@@ -44,6 +44,8 @@
\end{table}
\footnotetext{more info: \url{https://support.fixmestick.com/hc/en-us/articles/360001753213-List-of-Boot-Menu-Hot-Keys}}
+ \paragraph{Note} This may sound a bit stupid, but many TheAlternative members just spam the F-key row, as the Boot Menu key for some reason changes with every new model a manufacturer releases. This usually works surprisingly well!
+
\subsection{MacOS}
While turning your Mac on, hold down the \keys{\Altmac} button. A menu for
diff --git a/install_guide_updated/chapters/40_Installation.tex b/install_guide_updated/chapters/40_Installation.tex
index f4ef5c982bde62e812c9c673d366f87fbdb1ba0c..2d150b241661f9ce0d29b0294e71ae69142870f7 100644
--- a/install_guide_updated/chapters/40_Installation.tex
+++ b/install_guide_updated/chapters/40_Installation.tex
@@ -5,8 +5,17 @@
\subsection{Ubuntu}
- After connecting to Wi-Fi (top right), open the installer and click through
- the menus displayed below. Don't forget to check \enquote{Install third party
+ After starting Ubuntu, select \enquote{Try Ubuntu (live)}, such that we can setup a wifi connection. For this, click on the top right, select the wifi symbol and click on \enquote{Select Network}. There, select Eduroam and enter the following information (and leave everything else at its default):
+
+ \begin{itemize}
+ \item Security: Protected EAP (PEAP)
+ \item Check the \enquote{no certificate required} checkbox
+ \item Username: nethz@student-net.ethz
+ \end{itemize}
+
+
+ Now, open the installer (top left) and click through
+ the menus displayed below. For the keyboard layout section, you can select the swiss keyboard called \enquote{German (Switzerland)}. Also, don't forget to check \enquote{Install third party
software} in the \enquote{Updates and other Software} menu to make sure that
everything will work out of the box\footnote{This is primarily drivers for
your hardware}. Also, select e.g. \enquote{Install Ubuntu alongside Windows}
@@ -42,15 +51,26 @@
\end{subfigure}
\end{figure}
+ Now, while waiting for the installer to do the rest, go grab a snack or a drink, as this process can take about \SIrange{10}{20}{\minute}.
+
\subsection{Fedora}
+
+ After starting Fedora, select \enquote{Try Ubuntu (live)}, such that we can setup a wifi connection. For this, click on the top right, select the wifi symbol and click on \enquote{Select Network}. There, select Eduroam and enter the following information (and leave everything else at its default):
+
+ \begin{itemize}
+ \item Security: Protected EAP (PEAP)
+ \item Check the \enquote{no certificate required} checkbox
+ \item Username: nethz@student-net.ethz
+ \end{itemize}
+
- After connecting to Wi-Fi (top right), start the Installer and select your
+ Now, start the Installer (Press \keys{\OSwin} and select the installer at the bottom) and select your
language. After that, you'll have a menu on which to select your keyboard
- layout and Partitioning. Just select the hard disk to install fedora on and
+ layout (probably \enquote{German (Switzerland)}) and Partitioning. Just select the hard disk to install fedora on and
let the installer do the dangerous work.\par\bigskip
If you are on Mac, select the partition you created earlier manually, as
- MacOS always creates partition with a filesystem on them.
+ MacOS always creates a partition with a filesystem on it.
\begin{figure}[!ht]
\begin{subfigure}{.5\linewidth}
@@ -73,4 +93,6 @@
\caption{Keyboard Layout}
\end{subfigure}
\end{figure}
+
+ Now, while waiting for the installer to do the rest, go grab a snack or a drink, as this process can take about \SIrange{10}{20}{\minute}.
\end{document}
diff --git a/install_guide_updated/chapters/50_Post-Install.tex b/install_guide_updated/chapters/50_Post-Install.tex
index 301258c8932fb726abb5140a70ee0d0e446f6d90..1e93a41b791ada2c9e025dfa160be8031e26af1f 100644
--- a/install_guide_updated/chapters/50_Post-Install.tex
+++ b/install_guide_updated/chapters/50_Post-Install.tex
@@ -39,8 +39,8 @@
\subsection{The End}
- Now that everything is set up and running, you are\ldots done. Congrats, you
- just finished the most difficult step in becoming a Linux Guru, and we with
+ Now that everything is set up and running, you are\ldots\ done. Congrats, you
+ just finished the most difficult step in becoming a Linux Guru, and we wish
you great fun on your journey on becoming one!\par\bigskip
If you want to learn more about Linux and how to get efficient with it, visit
diff --git a/install_guide_updated/include/images/fedora_36_activities.png b/install_guide_updated/include/images/fedora_36_activities.png
new file mode 100644
index 0000000000000000000000000000000000000000..7cadadf45375cf79f608793ed518502ca1849148
Binary files /dev/null and b/install_guide_updated/include/images/fedora_36_activities.png differ
diff --git a/install_guide_updated/include/images/fedora_36_desktop.png b/install_guide_updated/include/images/fedora_36_desktop.png
new file mode 100644
index 0000000000000000000000000000000000000000..d9b484ff27a9dfa2807d5b689ea982c5c89f241e
Binary files /dev/null and b/install_guide_updated/include/images/fedora_36_desktop.png differ
diff --git a/install_guide_updated/include/images/ubuntu_2204_activities.png b/install_guide_updated/include/images/ubuntu_2204_activities.png
new file mode 100644
index 0000000000000000000000000000000000000000..9bd43ccefe8d937aa48d2affb8e8482d5244216e
Binary files /dev/null and b/install_guide_updated/include/images/ubuntu_2204_activities.png differ
diff --git a/install_guide_updated/include/images/ubuntu_2204_desktop.png b/install_guide_updated/include/images/ubuntu_2204_desktop.png
new file mode 100644
index 0000000000000000000000000000000000000000..0abd4bdff21228232477690260ad2edcf782f58c
Binary files /dev/null and b/install_guide_updated/include/images/ubuntu_2204_desktop.png differ
diff --git a/install_guide_updated/master/install_guide_updated.tex b/install_guide_updated/master/install_guide_updated.tex
index 7bd15279adacbe2529ba37340af62051f1006111..c467995a2cad25a521a8f713d0aaa7d58e92a0e7 100644
--- a/install_guide_updated/master/install_guide_updated.tex
+++ b/install_guide_updated/master/install_guide_updated.tex
@@ -9,7 +9,6 @@
\begin{document}
\maketitle
- \newpage
\tableofcontents
\newpage