Merge branch 'old_web'

Conflicts:
	ocfweb/urls.py

ocfweb/docs/docs/about.md

@@ -0,0 +1,66 @@
+[[!meta title="About us"]]
+
+## The mission
+
+The OCF is an all-volunteer, student-run, student-initiated service group
+dedicated to free computing for all [University of California at
+Berkeley][berkeley] students, faculty, and staff.  The mission of the OCF is to
+provide an environment where no member of Berkeley's campus community is denied
+the computer resources he or she seeks, and to appeal to all members of the
+Berkeley campus community with unsatisfied computing needs and to provide a
+place for those interested in computing to fully explore that interest.
+
+## What do we do?
+
+The Open Computing Facility provides free computing services to student,
+faculty, and staff, ranging from free printing to expiration-free web
+space to Unix shell accounts to email. Furthermore, the OCF operates a
+highly frequented long-hours computing lab with a generally high
+volunteer-staff-to-user ratio for accessible in-person support, as well
+as online support. In addition to these user services, the group also
+hosts numerous student group websites, and provides support to these and
+other organizations on campus.
+
+To be able to do this, we are always aiming to secure more resources to
+fully meet the needs of everyone in the campus community.  Our primary
+resources are our GNU/Linux workstations and servers, entirely
+administered by [[student volunteers|doc staff]].
+These resources are located within our computing lab in the basement of
+Hearst Gym.
+
+To help people explore the field of computing and educate them about the
+resources available, the OCF also provides a variety of educational services.
+We used to co-sponsor a series of Help Sessions, short classes taught
+throughout the semester on a wide range of computing topics, from beginner to
+advanced levels, and focusing on resources available to the Berkeley campus
+community.  These now take the form of [DeCal
+courses][decal] offered by us. We also offer e-mail and
+in-person consulting with our volunteer staff members, as well as online
+sources of information about computing on the Berkeley campus and how to use
+the available resources.  Additionally, the OCF has conducted career fairs in
+the past with its sister organization, the [Computer Science Undergraduate
+Association][csua]
+
+Policies for this cluster and decisions for the OCF organization are made
+by the OCF Board of Directors, a group of students elected each semester
+by the OCF membership.  The Board meetings, held at least once every two
+weeks when classes are in session, are open to the public and provide a
+chance for any user to express their concerns or opinions about the OCF.
+
+## How to find us
+
+The OCF is located in the basement of Hearst Gym (see [map][map]). Normal
+hours are Monday through Friday 9AM - 6PM, Saturday 11AM
+- 6PM, and Sunday 12PM - 5PM.
+
+If you need to contact OCF staff members, you may [[send us an email|doc
+contact]]
+
+The Open Computing Facility is a student group acting independently of
+the University of California.  We take full responsibility for our
+organization and this website.
+
+[berkeley]: http://berkeley.edu
+[decal]: http://decal.ocf.berkeley.edu
+[csua]: http://csua.berkeley.edu
+[map]: http://status.ocf.berkeley.edu/2012/06/moving-to-hearst-gym.html

ocfweb/docs/docs/about/formerstaff.md

@@ -0,0 +1,102 @@
+[[!meta title="Previous staff"]]
+
+## Where have OCF staffers gone after leaving the OCF?
+
+Many OCF staffers have found the skills and experience they gained from being
+OCF staff have been useful after leaving us. While we obviously can't claim
+credit for everyone or being the sole source of experience for people, we'd
+like to think everyone who has donated time to help us has gained something in
+return, whether it be skills, experience, new friends, or just the satisfaction
+of making a difference helping your fellow students.
+
+Some of the places OCF staffers have gone on to work at:
+
+### On the Berkeley Campus
+
+* [Berkeley Multimedia Research Center](http://www.bmrc.berkeley.edu/)
+* [Center for Extreme Ultraviolet Astrophysics](http://www.cea.berkeley.edu/)
+* [EECS Department Technical & Computing Services (TCS)](http://www.eecs.berkeley.edu/~tcs/)
+* [Campus Information Systems & Technology (IS&T)](http://ist.berkeley.edu/)
+* [Haas School of Business](http://www.haas.berkeley.edu/)
+* [InfoPad Research Group, Electrical Engineering](http://infopad.eecs.berkeley.edu)
+* [Lawrence Berkeley National Labs](http://www.lbl.gov/)
+* [Letters & Science Computer Resources](http://ls.berkeley.edu/lscr/)
+* [Molecular & Cell Biology](http://mendel.berkeley.edu/homepage.html)
+* [Residential Computing Services, Housing and Dining](http://www.rescomp.berkeley.edu/staff/)
+* [School of Information Management and Systems](http://www.sims.berkeley.edu/)
+* [School of Law - Boalt Hall](http://www.law.berkeley.edu/)
+* [Statistical Computing Facility](http://stat-www.berkeley.edu/)
+
+### Elsewhere
+
+* [The Aerospace Corporation](http://www.aero.org/)
+* [Amazon](http://www.amazon.com)
+* [Americorps](http://www.americorps.org/)
+* [Anderson Consulting](http://www.ac.com/)
+* [Apple Computer](http://www.apple.com/)
+* [Arthur Andersen & Co.](http://www.arthurandersen.com/) (Information Services Group)
+* [Bank of America](http://www.bofa.com/)
+* [Bay Area BioFuel](http://www.bayareabiofuel.com/)
+* [Berkeley Systems](http://www.berksys.com/)
+* [BigBook](http://www.bigbook.com/)
+* [Carnegie Mellon Univeristy School of Computer Science](http://www.cs.cmu.edu/)
+* [Cisco Systems, Inc.](http://www.cisco.com/)
+* [Compaq](http://www.compaq.com/)
+* [CRL Network Services](http://www.crl.com/)
+* [Digital Equipment Corporation](http://www.dec.com/) (acquired by [Compaq](http://www.compaq.com/))
+* [Drogin, Kakigi, & Assoc.](http://www.dkstat.com/)
+* [Forte Software](http://www.forte.com/) (now part of [Sun Microsystems](http://www.sun.com/ ))
+* [Fry's Electronics](http://www.outpost.com/)
+* [Global Network Navigator, Inc.](http://www.gnn.com/)
+* [HotWired](http://www.hotwired.com/)
+* [Howard Hughes Medical Institute](http://www.hhmi.org/)
+* [IBM](http://www.ibm.com/)
+* [Inktomi](http://www.inktomi.com/)
+* [Interactive Development Environments](http://www.ide.com/)
+* [Legato](http://www.legato.com/)
+* [Microsoft](http://www.microsoft.com/)
+* [Mindsource Software Engineers](http://www.mindsrc.com/)
+* [Netcom](http://www.netcom.com/)
+* [MetaReward/NetFlip](http://www.netflip.com/)
+* [Netblue](http://www.netblue.com/)
+* [Netscape](http://www.netscape.com/)
+* [Network Appliance](http://www.netapp.com/)
+* [Neuron Data](http://www.neurondata.com/)
+* [Newspager Corp. of America](http://www.nca.com/)
+* [Oracle](http://www.oracle.com/)
+* [7M Consulting](http://www.shimmer.com/~7m/7m-goals.html)
+* [SiByte, Inc](http://sibyte.broadcom.com) (acquired by [Broadcom](http://www.broadcom.com)]
+* [Silicon Graphics (SGI)](http://www.sgi.com/)
+* [Snapfish](http://www.snapfish.com/)
+* [StarNine Technologies](http://www.starnine.com/)
+* [Sun Microsystems](http://www.sun.com/)
+* [Taos Mountain Software](http://www.taos.com/gobears)
+* [TCSI Corp.](http://www.tcs.com/)
+* [Walmart.com](http://www.walmart.com/)
+* [Wells Fargo Bank](http://www.wellsfargo.com/)
+* [Yggdrasil Computing, Inc.](http://www.yggdrasil.com/)
+Z-Code Software (now part of [NetManage, Inc.](http://www.netmanage.com/))
+
+(Many of the above are places people have taken full-time jobs at. Some
+however, were co-ops or assignments done as a contractor for an agency such as
+Taos or MindSource.)
+
+## Other groups
+
+Other groups that OCF members have joined and helped using the skills they
+gained as OCF staff:
+
+### On the Berkeley Campus
+
+* ASUConline
+* [CalLUG - the UCB Linux User's Group](http://www-callug.cs.berkeley.edu/)
+* [Computer Science Undergrad Assoc.](http://www.csua.berkeley.edu/)
+* [Eta Kappa Nu](http://www-hkn.eecs.berkeley.edu/) (EECS Honor Society)
+* [Experimental Computing Facility](http://www.xcf.berkeley.edu/)
+* [Students Improving Campus Online Services](http://server.berkeley.edu/SICOS.html)
+* [U. C. Society of Electrical Engineers](http://www-ieee.eecs.berkeley.edu/) (IEEE Student Chapter)
+
+### Elsewhere
+
+* [The NetBSD Project](http://www.netbsd.org/)
+* [NetDay '96](http://www.netday96.com/)