diff --git a/chapters/Dispense101.tex b/chapters/Dispense101.tex
index a444c142703059a0a4af15aa26568758fd1e3b3d..a10ea7c455c0f63fa1ce9a83305f750aaee1cb0f 100644
--- a/chapters/Dispense101.tex
+++ b/chapters/Dispense101.tex
@@ -29,11 +29,11 @@ You can also access Dispense using the \shell{dispense} command. Dispense isn't
% \label{webdispense.png}
%\end{figure}
-%\begin{figure}[H]
-% \centering
-% \includegraphics[width=0.75\textwidth]{figures/cokemachine.png}
-% \caption{Coke Machine}
-% \label{cokemachine.png}
-%\end{figure}
+\begin{figure}[H]
+ \centering
+ \includegraphics[width=0.75\textwidth]{figures/cokemachine.png}
+ \caption{Coke Machine}
+ \label{cokemachine.png}
+\end{figure}
%\end{mdframed}
diff --git a/chapters/Events.tex b/chapters/Events.tex
index d6acebfc6684decd1bb68130a63788d9b8bf210d..1578bd8355c7caf8c1bde23992787e3f1bd7af37 100644
--- a/chapters/Events.tex
+++ b/chapters/Events.tex
@@ -71,7 +71,7 @@ Tech talks are a chance to demonstrate your own tech-y knowledge, or learn from
\pagebreak
%\begin{mdframed}[backgroundcolor=white]
-\color{black}{\section{FUCC Camp Scholarship}}
+\color{black}{\section{FUCC Camp Scholarship}\label{camp_scholarship}}
\noindent \color{black}{\bf Incoming message from James Cox and Lionel Price:}
@@ -95,6 +95,13 @@ also need to declare in writing that they will participate in at least
one game of DotA during UCC Camp, and that when we play ET you will
not be a noob in the back with a mortar accomplishing nothing all
match.}
+
+\begin{figure}[H]
+ \centering
+ \includegraphics[width=0.5\textwidth]{figures/WolfET_logo.jpg}
+ \caption{ET Logo. Don't be a noob.}
+\end{figure}
+
%\end{mdframed}
%\begin{figure}[H]
diff --git a/chapters/Games.tex b/chapters/Games.tex
index 5b63c1cc17461981ae9074368c285ba726e38a23..3172f6de4f0712fc7c775c4a9f5bac1278f2b2f9 100644
--- a/chapters/Games.tex
+++ b/chapters/Games.tex
@@ -2,7 +2,7 @@
Do you like Steam? Of course you do! Join UCC's Steam Group: \url{http://steamcommunity.com/groups/UCC}
-\noindent UCC runs its own TF2, Wolfenstein: Enemy Territory (WolfET) and Minecraft servers.
+\noindent UCC runs its own TF2, WolfET and Minecraft servers.
There are also a range of other games that members enjoy playing in the clubroom. Here is a summary.
\section{Minecraft}
@@ -10,16 +10,30 @@ There are also a range of other games that members enjoy playing in the clubroom
Minecraft is a game where you mine blocks and craft things out of them. It is more exciting than it sounds. Within 5 minutes you will be addicted. But you probably already know this.
Our (modded) Minecraft server is at \shell{minecraft.ucc.asn.au}. The modpack changes every three to six months, so you will never get bored!
-For more instructions, visit \url{http://minecraft.ucc.asn.au/ucc}.
+For more instructions, visit \url{http://minecraft.ucc.asn.au/ucc}. You can also find maps of the world there (Figure \ref{minecraft_pigmap.png}).
-\section{TF2}
+\begin{figure}[H]
+ \centering
+ \includegraphics[width=0.5\textwidth]{figures/minecraft_pigmap.png}
+ \caption{Part of the UCC Minecraft world}
+ \label{minecraft_pigmap.png}
+\end{figure}
-Otherwise known as ``Hat Fortress 2``. The TF2 server is located at \shell{heathred.ucc.asn.au}.
+\section{WolfET}
+Wolfenstein: Enemy Territory, (or just ET) is an old game but is still incredibly popular at LANs. There is a scholarship (See \ref{camp_scholarship}) available for the camp which requires playing ET. The ET server is at \server{heathred.ucc.asn.au}.
-\section{WolfET}
+\section{TF2}
+
+Team Fortress 2, also known as Hat Fortress 2. The TF2 server is located at \shell{heathred.ucc.asn.au}.
+
+\begin{figure}[H]
+ \centering
+ \includegraphics[width=0.5\textwidth]{figures/tf2_hat.png}
+ \caption{The ultimate goal of TF2 is to aquire these}
+ \label{tf2_hat.png}
+\end{figure}
-WolfET is an old game but is still incredibly popular at LANs.
\section{DoTa}
diff --git a/chapters/Glossary.tex b/chapters/Glossary.tex
index d165a7d27a7bcc52abdbca41de4d9cf708d6fc60..299168cbb05dbfd409324e52d4ec4a1fc8018c2c 100644
--- a/chapters/Glossary.tex
+++ b/chapters/Glossary.tex
@@ -1,4 +1,6 @@
-\chapter{Glossary}
+\zchapter{Glossary}
+\renewcommand{\familydefault}{\ttdefault}
+ \rowcolors{1}{}{lightgray}
\small{
\begin{tabular}{p{0.2\linewidth}|p{0.7\linewidth}}
@@ -33,16 +35,20 @@ GNOME &
GNU Networked Object Model Environment -- an open source desktop environment aimed primarily at UNIX computers. Quite popular in the past, before it removed all of the features people liked. \\
GNU &
GNU is Not Unix -- a layer of libraries and utilities to implement a UNIX like operating system, commonly used on top of Linux. \\
+\end{tabular}}
+
+\pagebreak
+
+\small{
+\begin{tabular}{p{0.2\linewidth}|p{0.7\linewidth}}
+ \rowcolor{black} \color{white}{Term} & \color{white}{Translation} \\
+
Internet Explorer &
Just use Firefox. No, really. \\
IRC &
The lifeblood of UCCan communication. Internet Relay Chat lets you share news, stories and terrible puns with other members worldwide. \\
KDE &
The K Desktop Environment. A rival of GNOME which some members prefer. Contains a frankly scary number of features, and a memory footprint to match. \\
-\end{tabular}
-
-\begin{tabular}{p{0.2\linewidth}|p{0.7\linewidth}}
- \rowcolor{black} \color{white}{Term} & \color{white}{Translation} \\
kernel &
The core of an operating system. All operating systems have a kernel, some popular ones include the Linux kernel and the Mach kernel. \\
LDAP &
@@ -61,12 +67,23 @@ OCM &
Ordinary Committee Member -- the worker drones of the UCC Committee, they do lots of work, for little reward. \\
Oligoboot &
boots more then one operating system (selectable when you boot). These all end up booted into Windows. \\
+
OpenSolaris &
A UNIX developed by Sun Microsystems, and abandoned by Oracle. \\
NeXTStep &
An operating system developed by NeXT before they were bought out by Apple. Lots of NeXTStep is incorporated into Mac OS X. \\
open source &
A software ideology, where the source code to software (what is compiled into the program you run) is freely available. Also known as Free Software, exactly what makes a program open source is a good way to get into an argument. \\
+
+
+\end{tabular}}
+
+\pagebreak
+
+\small{
+\begin{tabular}{p{0.2\linewidth}|p{0.7\linewidth}}
+ \rowcolor{black} \color{white}{Term} & \color{white}{Translation} \\
+
Planet &
A web page that syndicates blogs. UCC has one at \url{http://planet.ucc.asn.au/} \\
Secret Wheel Song &
@@ -75,11 +92,6 @@ SLA &
A Service Level Agreement. A document describing how reliable services are. UCC does not have one, and you should not ask Wheel members about it. \\
terminal server &
Sort of a router for serial ports, allows you to connect to one serial port from another. Usually connected to DEC Terminals, servers and dispense. (It can also refer to other sorts of servers which provide login sessions over the network). \\
-\end{tabular}
-
-
-\begin{tabular}{p{0.2\linewidth}|p{0.7\linewidth}}
- \rowcolor{black} \color{white}{Term} & \color{white}{Translation} \\
theft book &
this is where you write down that you borrowed tools from UCC. It is not for borrowing books; you mail \href{mailto:books@ucc.asn.au}{books@ucc.asn.au} to do that. \\
TLA &
@@ -93,9 +105,10 @@ The University wireless network. Available around campus where UCC's wireless is
UniSFA &
the University Science Fiction Association, the ones down the hall. \\
VM &
-A VM or Virtual Machine is a computer emulated on top of another computer. Many of the UCC's servers run inside VMs. The claim is that UCC's VMs are not a ``single point of failure.'' That's the machine they are all running on: \server{medico}. \\
+A VM or Virtual Machine is a computer emulated on top of another computer. Many of the UCC's servers run inside VMs. The claim is that UCC's VMs are not a ``single point of failure.'' That's the machine they are all running on: \server{medico}. \\
WAIX &
WA Internet eXchange -- a group of ISPs and interested bodies who peer resources on the Internet for mutual benefit. \\
Wheel Group &
the group responsible for maintaining computers, accounts and services in UCC. \\
+
\end{tabular}}
diff --git a/figures/WolfET_logo.jpg b/figures/WolfET_logo.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..d82cb92e5c1950193ade3ce74525f913be6ee59d
Binary files /dev/null and b/figures/WolfET_logo.jpg differ
diff --git a/figures/minecraft_pigmap.png b/figures/minecraft_pigmap.png
new file mode 100644
index 0000000000000000000000000000000000000000..5b05dc1001e584d136b1f8e750cc5a3244347539
Binary files /dev/null and b/figures/minecraft_pigmap.png differ
diff --git a/figures/tf2_hat.png b/figures/tf2_hat.png
new file mode 100644
index 0000000000000000000000000000000000000000..ffc78493879d288217311fb1911c22c9ba793708
Binary files /dev/null and b/figures/tf2_hat.png differ
diff --git a/fresher_guide.pdf b/fresher_guide.pdf
index 3eedb60a77152e96fea68819bfda9e2fa45ffcee..f7cc9b14b1c94852ec14882f301bb72cd9626b3d 100644
Binary files a/fresher_guide.pdf and b/fresher_guide.pdf differ
diff --git a/fresher_guide.tex b/fresher_guide.tex
index 35e63df8866bc393f3278db68db71c875896c111..e311840361292a09e40c0e63117f262f14336af5 100644
--- a/fresher_guide.tex
+++ b/fresher_guide.tex
@@ -2,7 +2,7 @@
% This is complicated because it is based on [SZM]'s 2012 Honours Thesis template, which in turn was based on a template written by a Physics Professor.
% ~50% of this isn't actually needed, but it's too much effort to clean it up.
-\documentclass[a5paper,10pt]{extreport}
+\documentclass[a5paper,10pt,openany]{extreport}
\usepackage[margin=0.75in,headsep=0.25in,footskip=0.25in]{geometry}
\renewcommand{\familydefault}{\sfdefault}
%\renewcommand{\familydefault}{\ttdefault}
@@ -94,6 +94,7 @@
\newcommand{\pun}[1]{#1} % Emphasising it is kind of unnecessary
% Shell command
\newcommand{\shell}[1]{\texttt{#1}}
+\newcommand{\server}[1]{\texttt{#1}}
% Rants
\newcommand{\rant}[1]{\textsc{#1}}
\renewcommand{\url}[1]{<\href{#1}{\underline{\color{darkblue}{#1}}}>}
@@ -200,7 +201,7 @@
\linespread{1.0}
%\include{chapters/UnixCommands}
-%\include{chapters/Glossary}
+\include{chapters/Glossary}
% ETC
%\newpage