diff --git a/Makefile b/Makefile
index b42bf096933d3b64be730c60bd37e2ad87c16a3e..2c1f1367f247d7f891d3706b4e692beabfa6dbba 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,7 @@
#Makefile for Fresher Guide
NAME=fresher_guide
+TEX=pdflatex
all :
make clean
@@ -9,13 +10,13 @@ all :
fresher_guide.pdf : fresher_guide.tex
rm -f *.aux *.bbl *.log *.toc *.lof *.blg *.lot
- pdflatex -shell-escape $(NAME)
+ $(TEX) -shell-escape $(NAME)
bibtex $(NAME)
- pdflatex --shell-escape $(NAME)
- pdflatex --shell-escape $(NAME)
+ $(TEX) --shell-escape $(NAME)
+ $(TEX) --shell-escape $(NAME)
bibtex $(NAME)
- pdflatex --shell-escape $(NAME)
- pdflatex --shell-escape $(NAME)
+ $(TEX) --shell-escape $(NAME)
+ $(TEX) --shell-escape $(NAME)
rm -f *.bbl *.log *.toc *.lof *.blg *.lot
diff --git a/chapters/Dispense101.tex b/chapters/Dispense101.tex
index 2d6dc2e93eb2343662c089dc5492e221904c6616..1d6b57563105450e8de0595c12e02aef4be7354e 100644
--- a/chapters/Dispense101.tex
+++ b/chapters/Dispense101.tex
@@ -2,7 +2,7 @@
% How to use Dispense.
-At the same time as you set up your account, you will also have your dispense account set up. Dispense is the program that allows users to store credit and purchase items from the coke/snack machines (which are almost always cheaper than what you would find elsewhere on campus). Coke members can help you add credit to your dispense account. Call out for one in the clubroom if need be, there's always one around.
+At the same time as you set up your account, you will also have your dispense account set up. Dispense is the program that allows users to store credit and purchase items from the coke/snack machines. Coke members can help you add credit to your dispense account. Call out for one in the clubroom if need be, there's always one around.
The easiest way to dispense a drink is probably the web interface (Figure \ref{webdispense.png}). Simply enter your username and password and then select a drink.
@@ -12,7 +12,7 @@ Due to technical reasons, snacks cannot be dispensed using this interface. Getti
You can also use your Student Card or SmartRider as a log in device on the snack machine. To do so, log in to the Snack Machine and hold whichever card you want to use up to the card scanner (it's the thing with the blinking green light) and the card should auto- enroll. To log in using the card, simply hold the enrolled card up to the card scanner.
-You can also access Dispense via shell login and using the \shell{dispense} command. Dispense isn't installed on clubroom machines so you will have to use \shell{ssh} to access one of UCC's servers.
+You can also access Dispense using the \shell{dispense} command. Dispense isn't installed on clubroom machines so you will have to use \shell{ssh} to access one of UCC's servers.
\begin{figure}[H]
\centering
diff --git a/chapters/Events.tex b/chapters/Events.tex
index 3f897615cd1c52d771f96252ca0e52d5b7ea73fa..ab10c618aca6f5c2fa37369dbcd6d151713a58c2 100644
--- a/chapters/Events.tex
+++ b/chapters/Events.tex
@@ -1,50 +1,52 @@
\chapter{UCC Events}
-(dates and times subject to change)
+Dates and times are subject to change.
% By [XON]
\section{UCC Fresher Welcome}
-Friday, February 31st
+\fbox{ Friday, February 31st
5:00 PM
-Cameron Hall Loft (above the UCC clubroom)
+Cameron Hall Loft (above the UCC clubroom)}
-The Fresher welcome exists to welcome you, a new UCC member, to the club. There will be a number of current members there to talk with and get to know, and all of your questions about the club and how to use it will be answered. As a bonus, all first time members get FREE pizza.
+The Fresher welcome exists to welcome you, a new UCC member, to the club. There will be a number of current members there to talk with and get to know, and all of your questions about the club and how to use it will be answered. As a bonus, all first time members get {\bf FREE pizza}.
\section{UCC Annual General Meeting}
-Tuesday, March 11th
-1.00 PM (common lunch hour of UWA)
-Guild Council Meeting Room
+\fbox{When: Tuesday, March 11th
+1.00 PM
+Guild Council Meeting Room}
-The AGM is the meeting at which the new UCC committee is elected for 2014. The only way to be represented is to attend on the day. As a Fresher, you should attend to either run for or vote for the position of the Fresher Representative,who will be your liaison for the committee. If you don't know where the Guild Council Meeting Room is, arrive at the UCC clubroom a little early to join the mass exodus.
+The AGM is the meeting at which the new UCC committee is elected for 2014. The only way to be represented is to attend on the day. As a Fresher, you should attend to either run for or vote for the position of the Fresher Representative, who will be your liaison for the committee. If you don't know where the Guild Council Meeting Room is, arrive at the UCC clubroom a little early to join the mass exodus.
\section{Easter LAN}
-Easter Weekend
-3:00 PM to the morning after
+\fbox{When: Easter Weekend
+3:00 PM to the morning after}
UCC runs a number of LANs throughout the year, some with proper organisation, some without. The Easter LAN is the first big LAN of the academic year, taking place over the Easter weekend, the first weekend of mid-Semester one study break. We play a number of different games, and of course you can organise your own. LANs are free for all UCC members, but you can bring a friend for around \$5 (though of course you should encourage them to join). Bring your own PCs, or use one of the limited stock in the clubroom.
\section{LANs}
-Throughout the Year
+{\bf When:} Throughout the Year
From Dusk til Dawn
The UCC hosts a number of more LANs throughout the year. As above, the Easter LAN is the first big one. Expect other LANs during the semester and breaks.
\section{Cameron Hall Quiz Night}
-First Semester, probably in May
-Evening
+\fbox{When: First Semester, probably in May, Evening}
-Bringing together the various clubs of Cameron Hall, the quiz night is the only proper time to use your smarts throughout your degree. Likely to take place in the UWA Tav, tables and tickets will be organised closer to the date.
+Bringing together the various clubs of Cameron Hall, the quiz night is the only proper time to use your smarts throughout your degree. Traditionally in the UWA Tavern (18+).
\section{UCC Camp}
-Winter Break
+\fbox{When: Winter Break}
-The UCC goes camping! Without tents. Some time during the winter break, UCC will host a camp, probably at Camp Leschenaultia. This is a chance to get your computer out of the house for a few days, tinkering and playing games with a whole bunch of other members. Don't worry, you won't be without precious internet. For first timers to the camp, some old members may offer a "scholarship" to the camp if you can't afford it. Expect more details closer to the date.
+The UCC goes camping! Without tents. There is a dormitory. Some time during the winter break, UCC will host a camp, probably at Camp Leschenaultia. This is a chance to get your computer out of the house for a few days, tinkering and playing games with a whole bunch of other members. Don't worry, you won't be without precious internet.
\subsection{FUCC Camp Scholarship}
-A message from James Cox and Lionel Price:
-For new members to UCC, Lionel and I would like to tell you about our
+\begin{mdframed}[backgroundcolor=darkgray]
+\color{green}{Incoming message from James Cox and Lionel Price:}
+
+
+\color{green}{For new members to UCC, Lionel and I would like to tell you about our
full-ride scholarship program. We realise that Camp is fairly
expensive, but as once-freshers made good we are financially able to
provide unto others. Previous recipients of these scholarships have
@@ -55,22 +57,23 @@ reason why I now offer this scholarship.
Two first-time UCC Campers will have their entry fee paid for by us.
As before, you will also obtain the privilege, if you should so wish,
-to add a pink F to your UCC tags, denoting sophistication, intellect,
+to add a pink \textcolor{pink}{F} to your UCC tags, denoting sophistication, intellect,
and exclusive membership of an elite group of teamkilling imbeciles.
To be eligible for this award, you must be a UWA student, member of
UCC, and to not have attended a previous UCC Camp. Applicants will
also need to declare in writing that they will participate in at least
-one game of DotA0 during UCC Camp, and that when we play ET you will
+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.
+match.}
+\end{mdframed}
\section{UCC 40th Anniversary Dinner}
-Saturday, September 13th
+{\bf When:} Saturday, September 13th
7.00 PM til late(r)
South of Perth Yacht Club
-The big non-tech event of the year, the 40th Anniversary dinner is an opportunity for new members to meet the old blood of UCC, the ones that are still kicking on. Taking place in the lovely South of Perth Yacht Club, this fully catered dinner will be a good celebration of 40 years of computing. Expect entry prices to be around $60 to $80, which should cover dinner.
+The big non-tech event of the year, the 40th Anniversary dinner is an opportunity for new members to meet the old blood of UCC, the ones that are still kicking on. Taking place in the lovely South of Perth Yacht Club, this fully catered dinner will be a good celebration of 40 years of computing. Expect entry prices to be around \$60 to \$80, which should cover dinner.
\section{Cameron Hall Charity Vigil}
Semester 2 - around mid-semester study break
@@ -82,4 +85,4 @@ Once a year, all of the clubs in Cameron Hall get together and hold a night of f
Throughout the Year
At Various Times
-Tech talks are a chance to demonstrate your own tech-y knowledge, or learn from someone else. Taking place throughout the year, as interest demands, the talks will cover a variety of topics, previous ones including introductions to TOR, learning basics, and the magic of data compression. Early on in the semester, a number of tech talks will cover learning to use the various machines and servers of the club.
+Tech talks are a chance to demonstrate your own tech-y knowledge, or learn from someone else. Taking place throughout the year, as interest demands, the talks will cover a variety of topics, previous ones including introductions to TOR, learning basics, and the magic of data compression. Early on in the semester, a number of tech talks will cover learning to use the club's machines.
diff --git a/fresher_guide.pdf b/fresher_guide.pdf
index 39ed1dee247f28b38e8b654fb493200a2ac27369..dbfdb8e8b24e7aa5e4edd5c9573eccf6043ea9a8 100644
Binary files a/fresher_guide.pdf and b/fresher_guide.pdf differ
diff --git a/fresher_guide.tex b/fresher_guide.tex
index cd22ca6c8ac2fd54d151518a612d27c259070219..59748e28267a31fb5bbafddc9cb2997fffb91a89 100644
--- a/fresher_guide.tex
+++ b/fresher_guide.tex
@@ -3,6 +3,7 @@
% ~50% of this isn't actually needed, but it's too much effort to clean it up.
\documentclass[a4paper,10pt,titlepage]{report}
+\renewcommand{\familydefault}{\ttdefault}
%\linespread{1.3}
%\usepackage{setspace}
%\onehalfspacing
@@ -11,6 +12,9 @@
%\parindent 0pt % sets leading space for paragraphs
+
+\usepackage{mdframed}
+
%\usepackage{natbib}
\usepackage{makeidx}
\usepackage{graphicx}
@@ -31,21 +35,22 @@
\titleformat{\chapter}
{\normalfont\LARGE\bfseries}{\thechapter.}{1em}{}
-\usepackage[usenames,dvipsnames]{color}
-\usepackage{listings} % For code snippets
-
-\definecolor{darkgray}{rgb}{0.95,0.95,0.95}
+%\usepackage[usenames,dvipsnames]{color}
+%\usepackage{listings} % For code snippets
+\definecolor{pink}{rgb}{1.0,0.5,0.5}
+\definecolor{darkgray}{rgb}{0.1,0.1,0.1}
\definecolor{darkred}{rgb}{0.75,0,0}
\definecolor{darkblue}{rgb}{0,0,0.75}
-\definecolor{pink}{rgb}{1,0.5,0.5}
-\lstset{language=Java}
-\lstset{backgroundcolor=\color{darkgray}}
-\lstset{numbers=left, numberstyle=\tiny, stepnumber=1, numbersep=5pt}
-\lstset{keywordstyle=\color{darkred}\bfseries}
-\lstset{commentstyle=\color{darkblue}}
+\definecolor{green}{rgb}{0,0.70,0}
+\definecolor{black}{rgb}{0,0,0}
+%\lstset{language=Java}
+%\lstset{backgroundcolor=\color{darkgray}}
+%\lstset{numbers=left, numberstyle=\tiny, stepnumber=1, numbersep=5pt}
+%\lstset{keywordstyle=\color{darkred}\bfseries}
+%\lstset{commentstyle=\color{darkblue}}
%\lstset{stringsyle=\color{red}}
-\lstset{showstringspaces=false}
-\lstset{basicstyle=\small}
+%\lstset{showstringspaces=false}
+%\lstset{basicstyle=\small}
@@ -86,6 +91,9 @@
\newcommand{\shell}[1]{\texttt{#1}}
% Rants
\newcommand{\rant}[1]{\textsc{#1}}
+\renewcommand{\url}[1]{\href{#1}{#1}}
+
+\newcommand{\setfont}[1]{\fontfamily{#1}\selectfont}
% To make underscores printable without escaping them
\usepackage[T1]{fontenc}
@@ -125,6 +133,11 @@
}
\cfoot{}
+\usepackage{etoolbox}
+\makeatletter
+\patchcmd{\chapter}{\if@openright\cleardoublepage\else\clearpage\fi}{}{}{}
+\makeatother
+
%---------------------------------------------------------
%---------------------------------------------------------
\begin{document}
@@ -163,7 +176,7 @@
\renewcommand{\bibname}{References}
\bibliography{references/refs}
\bibliographystyle{ieeetr}
-\addcontentsline{toc}{part}{References}
+%\addcontentsline{toc}{part}{References}
%---------------------------------------------------------
% Appendices