Merge branch 'master' of ssh://ssh.ucc.asn.au/uccvend-docs

diff --combined REPOSITORIES
index 26d0fdd,3619a19..0609dbf
--- 1/REPOSITORIES
--- 2/REPOSITORIES
+++ b/REPOSITORIES
@@@ -8,6 -8,11 +8,6 @@@ Clu
  Authoritative Repositories
  --------------------------
  
 -Name  : 
 -URL   :
 -URL   :
 -Content       : 
 -
  Name  :  uccvend-docs.git
  URL   :  git://git.ucc.asn.au/uccvend-docs.git 
  URL   :  http://git.ucc.asn.au/?p=uccvend-docs.git;a=summary
@@@ -25,18 -30,16 +25,16 @@@ Name       :  virtualsnac
  URL   :  https://github.com/ucc/virtualsnack
  Content       :  Curses based emulator of the UCC Snack Machine ROM
  
- Name  : 
- URL   :
- URL   :
- Content       : 
+ Name  :  uccvend-vendserver
+ URL   :  git://git.ucc.asn.au/uccvend-vendserver.git 
+ URL   :  http://git.ucc.asn.au/?p=uccvend-vendserver.git;a=summary
+ Content :  Snack machine python code
+ Notes :  Migrated from dispense2
  
  
  Planned Repositories
  --------------------
  
- Name  :  uccvend-vendserver
- Content :  Snack machine python code
- 
  Name  :  uccvend-snackrom
  Content :  Snack machine ROM code
  
@@@ -55,9 -58,6 +53,9 @@@ Content :  Repository for Vagrantfile f
  Name  :  uccvend-doorcode
  Content :  Working doorcode again
  
 +Name  :  uccvend-web
 +Content :  UCC webpages describing the horror
 +
  
  Repositories of Unknown Status
  ------------------------------
@@@ -92,22 -92,23 +90,23 @@@ URL        :  http://cvs.ucc.asn.au/cgi-bin/vi
  Status        :  Probably broken???   
  Content       :  UCC Door to jabber(XMPP) gateway
  
- Name  :  dispense2
- URL   :  http://cvs.ucc.asn.au/cgi-bin/viewvc.cgi/anoncvs/projects/dispense2/
- Status        :  Needs to be migrated
- Content       :  Contains Python Code for Snack machine, failed python dispense 
-            rewrite, bitrotted virtualvend
- 
  Name  :  openvend
  URL   :  http://cvs.ucc.asn.au/cgi-bin/viewvc.cgi/anoncvs/projects/openvend/
  Status        :  Needs to be migrated
  Content       :  Contains C code for Snack ROM, scans of cokebrain new board
  
  
- 
  Deprecated Repositories
  -----------------------
  
+ Name  :  dispense2
+ URL   :  http://cvs.ucc.asn.au/cgi-bin/viewvc.cgi/anoncvs/projects/dispense2/
+ Status        :  Needs to be migrated
+ Content       :  Contains Python Code for Snack machine, failed python dispense 
+            rewrite, bitrotted virtualvend
+ Notes :  Migrated to git.  uccvend-vendserver
+ 
+ 
  Name  :  zanchey/dispense2.git
  URL   :  http://git.ucc.asn.au/?p=zanchey/dispense2.git;a=summary
  Status        :  Not authoritative.  Patches need to be copied out.