Index: /README
===================================================================
--- /README	(revision 6195)
+++ /README	(revision 6196)
@@ -4,9 +4,9 @@
 
 = Directory/File layout =
-sampleserver     = general django layout
+doc              = documentation files e.g. papers and transcripts
 exodus           = exodus module
 exodus/static    = exodus static files
 exodus/templates = exodus template files
-
+sampleserver     = general django layout
 
 = Hacking =
Index: /doc/exodus_mysql
===================================================================
--- /doc/exodus_mysql	(revision 6196)
+++ /doc/exodus_mysql	(revision 6196)
@@ -0,0 +1,129 @@
+XXX: Initial model dependency design, needs documenting of choices and porting
+to direct code of ../exodus/models.py 
+
+XXX: Mis koppeling interlink en node 
+
+group
+    id
+    name
+    contact -> contact.id
+    network
+    netmask
+
+contact
+    id
+    name
+    adres
+    postcode
+    woonplaats
+    telefoonnr vast
+    telefoonnr mobiel
+    email
+    messengernr
+    function
+    group -> group.id
+    comment
+
+location
+    id
+    owner -> contact.id
+    operator -> contact.id
+    adres
+    postcode
+    woonplaats
+    GPS
+    telefoonnr vast
+    comment
+
+hardware
+    id
+    name
+    cpu
+    memory
+    mainboard
+    aantal pci sloten
+    aantal agp sloten
+    aantal mini pci sloten
+    aantal isa sloten
+    onboard video
+    onboard network
+    disksize
+    comment
+
+connector
+    id
+    name
+
+nictype
+    id
+    name
+    transmissionpower
+    connector
+    slottype
+    comment
+
+nic (zowel ethernet als wifi)
+    id
+    node -> node.id
+    mac address
+    type -> nictype.id
+    mode
+    ssid
+    channel
+    flashversion
+    connector -> connector.id
+    comment
+
+interlink
+    id
+    name
+    comment
+
+nicconfig (kan meer dan 1 per card ivm virtual interfaces)
+    id
+    nic -> nic.id
+    ip
+    hostname
+    network -> ippool.id
+    interlink -> interlink.id
+    comment
+
+antennehw
+    id
+    name
+    gain
+    range
+    height
+    directions
+    connector -> connector.id
+    comment
+
+antenne
+    id
+    nic -> nic.id
+    antennehw -> antennehw.id
+
+NF
+    id
+    versionnr
+    OS
+    OSversionnr
+
+ippool
+    id
+    network
+    netmask
+    group -> group.id
+
+system
+    id
+    name
+    builder -> contact.id
+    administrator -> contact.id
+    backup administrator -> contact.id
+    location -> location.id
+    hardware -> hardware.id
+    status (produktie/pre-produktie)
+    type (node/server)
+    NF ->  NF.id
+    comment
Index: /doc/todo.txt
===================================================================
--- /doc/todo.txt	(revision 6196)
+++ /doc/todo.txt	(revision 6196)
@@ -0,0 +1,21 @@
+XXX: Old todo list, needs merging with ../TODO
+
+** entries with ** have already been completed
+
+
+07\18\06
+
+-DHCPstart and DHCPstop blank=True,null=True maken 
+-link.status and linkpool.status is redundant
+
+07\19\06
+-Password and authentication
+**-rename table mode to wifimode
+
+08\02\06
+-Add 'network' foreign key to node
+-move wifi capabilities from NIC; split the table
+-Rethink NIC table
+-Link table has descriptions, not NIC
+-addnic has hardcoded '1' for foreignkey mode
+-location based ip, for routing