diff --git a/chapters/Dispense101.tex b/chapters/Dispense101.tex index cbba6f9039ceaa3b7bf7b753ecbd74b5dc2df255..fb4b95caf5b7ef42facd97b1bc548f8de8adc7b4 100644 --- a/chapters/Dispense101.tex +++ b/chapters/Dispense101.tex @@ -27,6 +27,11 @@ You can also access Dispense using the \shell{dispense} command. Dispense isn't \label{webdispense.png} \end{figure} -\%TODO: Picture of Coke machine and Blinken lights, please +\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 2ddb84cfa9754226f548a6dd86d6034bb0df61f5..3210f45181f963bdd254f1481b88a3a8483af3b2 100644 --- a/chapters/Events.tex +++ b/chapters/Events.tex @@ -1,20 +1,20 @@ \zchapter{UCC::Events} UCC runs a lot of events. You should go to them! Dates and times may change. + % Event with title and date \newenvironment{event}[3] { - \begin{mdframed}[backgroundcolor=white] - \color{black}{\section{#1}} - \begin{mdframed}[backgroundcolor=white] - When: #2 - \end{mdframed} - \begin{mdframed}[backgroundcolor=white] - Where: #3 + \begin{mdframed}[backgroundcolor=white,nobreak=true] + \color{black}{\section{#1}} + \begin{mdframed}[backgroundcolor=white] + When: #2 + \end{mdframed} + \begin{mdframed}[backgroundcolor=white] + Where: #3 + \end{mdframed} +}{ \end{mdframed} - - - -}{\end{mdframed}} +} % Simpler (no boxes) %\renewenvironment{event}[3] @@ -31,67 +31,44 @@ UCC runs a lot of events. You should go to them! Dates and times may change. % By [XON] -\begin{event}{Fresher Welcome}{Friday, February 31st, 5:00PM}{Cameron Hall Loft (above the UCC clubroom)} +\begin{event}{Fresher Welcome}{Friday, February 28th, 5:00PM}{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 {\bf FREE pizza}. \end{event} \begin{event}{Annual General Meeting}{Tuesday, March 11th, 1:00PM}{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. - \end{event} -\pagebreak -\begin{event}{Easter LAN}{Easter Weekend, 3:00PM until the morning after}{The Loft (above UCC Clubroom)} +\begin{event}{Easter LAN}{Easter Weekend, 3:00PM until the morning after}{The Loft (above UCC Clubroom)} 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. - \end{event} - \begin{event}{LANs}{Throughout the Year, From Dusk til Dawn}{The Loft (above UCC Clubroom)} - 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. - \end{event} \begin{event}{Cameron Hall Quiz Night}{First Semester, probably in May, Evening}{UWA Tavern} - Bringing together the various clubs of Cameron Hall, the quiz night is the only proper time to use your smarts throughout your degree. (18+ Event). - \end{event} - \begin{event}{Camp}{18th to 21st July}{Lake Leshenaultia} - The UCC goes camping! Without tents. There is a dormitory. During the winter break, UCC will host a camp 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. (18+ Event). - \end{event} - - \begin{event}{40th Anniversary Dinner}{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. - \end{event} -\pagebreak - \begin{event}{Cameron Hall Charity Vigil}{Semester 2 - around mid-semester study break - From Dusk til Dawn}{Cameron Hall} - Once a year, all of the clubs in Cameron Hall get together and hold a night of fun and games to raise money for charity. While the details of the night are still to come, the UCC will probably host a LAN. There will be an entry fee for this event, but expect it to be fully worth it. - \end{event} - \begin{event}{Tech Talks}{Throughout the Year}{UCC Clubroom and/or the Loft} - 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. - \end{event} -\pagebreak +\pagebreak \begin{mdframed}[backgroundcolor=white] \color{black}{\section{FUCC Camp Scholarship}} \color{black}{Incoming message from James Cox and Lionel Price:} diff --git a/chapters/Introduction.tex b/chapters/Introduction.tex index d2cb6a659bcfe25be391a81984163893be381be3..3ad493b7e5e0ca28bb3c2206b3907c54d6418eb9 100644 --- a/chapters/Introduction.tex +++ b/chapters/Introduction.tex @@ -1,8 +1,5 @@ \zchapter{Introduction} - - - % <person>'s welcome \newenvironment{welcome}[3] { @@ -41,6 +38,8 @@ Samuel Shenton [SAS] UCC President 2013 \end{welcome} +\pagebreak + \begin{welcome}{Zanchey}{David Adam}{zanchey} There is no escape! Don't make me destroy you. Fresher, you do not yet realize your importance. You've only begun to discover your power! Join me, and I will complete your training! With our combined strength, we can end this destructive conflict, and bring order to the galaxy. diff --git a/figures/cokemachine.png b/figures/cokemachine.png new file mode 100644 index 0000000000000000000000000000000000000000..9f6466901dabeff19ca38ba7adfeea3f5d468294 Binary files /dev/null and b/figures/cokemachine.png differ diff --git a/fresher_guide.pdf b/fresher_guide.pdf index cc52b26829d0a63b69e522363b3139f97418ce17..febcf99d4259e84d50778df833246dee20bbf449 100644 Binary files a/fresher_guide.pdf and b/fresher_guide.pdf differ diff --git a/fresher_guide.tex b/fresher_guide.tex index 167e37d8cf35207ca6b389d789d2a9450edca698..1d54ca72945ca03cbf215408e00ef78916ada4d7 100644 --- a/fresher_guide.tex +++ b/fresher_guide.tex @@ -2,14 +2,13 @@ % 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[a4paper,14pt]{extreport} +\documentclass[a5paper,9pt]{extreport} \usepackage[margin=0.75in,headsep=0.25in,footskip=0.25in]{geometry} \renewcommand{\familydefault}{\ttdefault} %\linespread{1.3} %\usepackage{setspace} %\onehalfspacing - \parskip 12pt % sets spacing between paragraphs + \parskip 8pt % sets spacing between paragraphs %\renewcommand{\baselinestretch}{1.5} % Uncomment for 1.5 spacing between lines %\parindent 0pt % sets leading space for paragraphs @@ -156,6 +155,9 @@ %--------------------------------------------------------- \begin{document} +% keeps text within our margins +\sloppy + \include{titlepage/Titlepage} % This is who you are