Index: branches/stable/alloctypes.html
===================================================================
--- branches/stable/alloctypes.html	(revision 414)
+++ branches/stable/alloctypes.html	(revision 445)
@@ -11,97 +11,190 @@
 <table class="regular">
 
-<tr><td colspan=2 class="heading">Allocation Types:</td><tr>
-
-<tr class="color1">
-<td>Customer netblock (default)</td><td>A direct allocation /30 or larger to a
-customer.  Note that this does NOT include RADIUS-routed "netblocks".  Internal systems
-should use the "End-use netblock" type.</td>
-</tr>
-
-<tr class="color2">
-<td>Static IP - Server pool</td><td>A single IP from a pool designated for
-servers</td>
-</tr><tr class="color1">
-<td>Static IP - Cable</td><td>A single IP address from a designated pool
-on the cable network.</td>
-</tr><tr class="color2">
-<td>Static IP - DSL</td><td>A single IP address from a designated pool
-on the DSL network.  Note that these are nominally in Sudbury or North Bay,
-even if the customer isn't.</td>
-</tr><tr class="color1">
-<td>Static IP - Dialup</td><td>A single IP address from a designated pool
-on a dialup RAS.</td>
-</tr><tr class="color2">
-<td>Static IP - Wireless</td><td>A single IP address from a designated pool
-on one of our wireless networks.</td>
-</tr>
-
-<tr class="color1">
-<td>Static pool - Servers</td><td>A pool of IP addresses available for one-by-one
-assignment to servers in a POP.  This will usually only be in Sudbury.</td>
-</tr><tr class="color2">
-<td>Static pool - Cable</td><td>A pool of IP addresses available for one-by-one assignment
-to customers on cable.</td>
-</tr><tr class="color1">
-<td>Static pool - DSL</td><td>A pool of IP addresses available for one-by-one assignment to
-customers on DSL.  Note that individual IPs will be "assigned" to the customer's
-city, but the pool they are a part of will normally be "assigned" to Sudbury or
-North Bay.</td>
-</tr><tr class="color2">
-<td>Static pool - Dialup</td><td>A pool of IP addresses available for one-by-one
-assignment to dialup customers.</td>
-</tr><tr class="color1">
-<td>Static pool - Wireless</td><td>A pool of IP addresses available for one-by-one
-assignment to customers on one of our wireless networks.</td>
-</tr>
-
-<tr class="color2">
-<td>End-use netblock</td><td>A /30 or larger allocation for arbitrary services (LAN
-management, servers we want fully subnet-isolated, etc)</td>
-
-</tr><tr class="color1">
-<td>Dialup netblock</td><td>Netblock assigned to one or more RAS units in a POP</td>
-</tr><tr class="color2">
-<td>Dynamic DSL block</td><td>Netblock for (mostly residential) PPPoE DSL.  Nominally
-"assigned" to Sudbury</td>
-</tr><tr class="color1">
-<td>Dynamic cable block</td><td>Netblock for (mostly residential) DHCP cable.</td>
-</tr><tr class="color2">
-<td>Dynamic WiFi block</td><td>Netblock for (mostly residential) (mostly) PPPoE wireless.</td>
-</tr><tr class="color1">
-<td>Dynamic VoIP block</td><td>Netblock for DHCP-assigned VoIP services.</td>
-
-</tr><tr class="color2">
-<td>Static IP - LAN/POP</td><td>A single IP address from a designated pool for our
-internal LANs - either at a single POP or for a VPN.</td>
-</tr><tr class="color1">
-<td>Static pool - LAN/POP</td><td>A pool of IP addresses available for one-by-one
-assignment to our internal LAN systems or VPNs.</td>
-
-</tr><tr class="color2">
-<td>Reserve for WAN blocks</td><td>Reserve a chunk of IP space for core routers/etc.</td>
-</tr><tr class="color1">
-<td>Reserve for dynamic-route DSL netblocks</td><td>Reserve a chunk of IP space for
-RADIUS-assigned "netblocks" from a PPPoE pool.  Note that this is similar to the static DSL
-pool, but IP space is to be allocated as /30 and larger netblocks, not single static IPs.</td>
-</tr><tr class="color2">
-<td>Reserve for ATM</td><td>Reserve a chunk of IP space for allocation to customers on ATM</td>
-</tr><tr class="color1">
-<td>WAN block</td><td>Individual netblock assignment for a core router.  Always taken from a
+<tr><td colspan=2 class="heading">Preseeded Allocation Types:</td><tr>
+
+<tr class="color1">
+<td>Customer netblock (default)</td>
+<td>A direct allocation /30 or larger to a customer.  Note that this does NOT 
+include RADIUS-routed "netblocks".  Non-customer systems should use the 
+"End-use netblock" type.</td>
+</tr>
+
+<tr class="color2">
+<td>Static IP - Server pool</td>
+<td>A single IP from a pool designated for servers</td>
+</tr>
+
+<tr class="color1">
+<td>Static IP - Cable</td>
+<td>A single IP address from a designated pool on the cable network.</td>
+</tr>
+
+<tr class="color2">
+<td>Static IP - DSL</td>
+<td>A single IP address from a designated pool on the DSL network.</td>
+</tr>
+
+<tr class="color1">
+<td>Static IP - Dialup</td>
+<td>A single IP address from a designated pool on a dialup RAS.</td>
+</tr>
+
+<tr class="color2">
+<td>Static IP - Wireless</td>
+<td>A single IP address from a designated pool on a wireless connection.</td>
+</tr>
+
+<tr class="color1">
+<td>Static pool - Servers</td>
+<td>A pool of IP addresses available for one-by-one assignment to servers in a 
+POP.</td>
+</tr>
+
+<tr class="color2">
+<td>Static pool - Cable</td>
+<td>A pool of IP addresses available for one-by-one assignment to customers on 
+cable.</td>
+</tr>
+
+<tr class="color1">
+<td>Static pool - DSL</td>
+<td>A pool of IP addresses available for one-by-one assignment to customers on 
+DSL.  Individual IPs will be "assigned" to the customer's city, but the pool 
+will remain assigned to its nominal origin.</td>
+</tr>
+
+<tr class="color2">
+<td>Static pool - Dialup</td>
+<td>A pool of IP addresses available for one-by-one assignment to dialup 
+customers.</td>
+</tr>
+
+<tr class="color1">
+<td>Static pool - Wireless</td>
+<td>A pool of IP addresses available for one-by-one assignment to customers on a 
+wireless connection.</td>
+</tr>
+
+<tr class="color2">
+<td>End-use netblock</td>
+<td>A /30 or larger allocation for arbitrary services - note this should not 
+be used for customer connections.  Use this if exact tracking of IP 
+usage in the block is not required.</td>
+</tr>
+
+<tr class="color1">
+<td>Dialup netblock</td>
+<td>Netblock assigned to one or more RAS units in a POP</td>
+</tr>
+
+<tr class="color2">
+<td>Dynamic DSL block</td>
+<td>Netblock for (mostly residential) PPPoE DSL.</td>
+</tr>
+
+<tr class="color1">
+<td>Dynamic cable block</td>
+<td>Netblock for (mostly residential) DHCP cable.</td>
+</tr>
+
+<tr class="color2">
+<td>Dynamic WiFi block</td>
+<td>Netblock for (mostly residential) (mostly) PPPoE wireless.</td>
+</tr>
+
+<tr class="color1">
+<td>Dynamic VoIP block</td>
+<td>Netblock for DHCP-assigned VoIP services.</td>
+</tr>
+
+<tr class="color2">
+<td>Static IP - LAN/POP</td>
+<td>A single IP address from a designated pool for internal LANs - either at a 
+single POP or for a VPN.</td>
+</tr>
+
+<tr class="color1">
+<td>Static IP - Managment</td>
+<td>A single IP address from a designated pool for managed devices.</td>
+</tr>
+
+<tr class="color2">
+<td>Static IP - Wifi CPE</td>
+<td>A single IP address from a designated pool for wireless CPE devices.</td>
+</tr>
+
+<tr class="color1">
+<td>Static pool - LAN/POP</td>
+<td>A pool of IP addresses available for one-by-one assignment to internal LAN 
+systems or VPNs.</td>
+</tr>
+
+<tr class="color2">
+<td>Static Pool - Managment</td>
+<td>A pool of IP addresses available for assignment to managed devices.</td>
+</tr>
+
+<tr class="color1">
+<td>Static pool - Wifi CPE</td>
+<td>A pool of IP addresses available for assignment to wireless CPE devices.</td>
+</tr>
+
+<tr class="color2">
+<td>Reserve for WAN blocks</td>
+<td>Reserve a chunk of IP space for core routers/etc.</td>
+</tr>
+
+<tr class="color1">
+<td>Reserve for dynamic-route DSL netblocks</td>
+<td>Reserve a chunk of IP space for netblocks configured on the customer end via 
+PPPoE/RADIUS.  Note that this is similar to the static DSL pool, but IP space is 
+to be allocated as /30 and larger netblocks, not single static IPs.</td>
+</tr>
+
+<tr class="color2">
+<td>Reserve for ATM</td>
+<td>Reserve a chunk of IP space for allocation to customers on ATM.</td>
+</tr>
+
+<tr class="color1">
+<td>Reserve for fibre</td>
+<td>Reserve a chunk of IP space for customers on a fibre connection.</td>
+</tr>
+
+<tr class="color2">
+<td>WAN block</td>
+<td>Individual netblock assignment for a core router.  Always taken from a
 block which has previously been reserved for such assignments.</td>
-</tr><tr class="color2">
-<td>Dynamic-route DSL netblock</td><td>Customer assignment for a RADIUS-assigned PPPoE
-"netblock".  Always taken from a block which has previously been reserved for such
-assignments.</td>
-</tr><tr class="color1">
-<td>ATM block</td><td>Customer assignment for a customer on ATM.  Always taken from a
+</tr>
+
+<tr class="color1">
+<td>Dynamic-route DSL netblock</td>
+<td>Customer assignment for a netblock configured on the customer end via 
+PPPoE/RADIUS.  Always taken from a block which has previously been reserved for 
+such assignments.</td>
+</tr>
+
+<tr class="color2">
+<td>ATM block</td>
+<td>Customer assignment for a customer on ATM.  Always taken from a
 block which has previously been reserved for such assignments.</td>
-
-</tr><tr class="color2">
-<td>Routing</td><td>Blocks not actually assigned to a service on their own, but which
+</tr>
+
+<tr class="color1">
+<td>Fibre</td>
+<td>Customer assignment for a customer on fibre. Always taken from a block 
+which has previously been reserved for such assignments.</td>
+</tr>
+
+<tr class="color2">
+<td>Routing</td>
+<td>Blocks not actually assigned to a service on their own, but which
 have been routed to individual POPs- typically /24, /23, /22</td>
-
-</tr><tr class="color1">
-<td>Master block</td><td>Our allocations from ARIN</td>
+</tr>
+
+<tr class="color1">
+<td>Master block</td>
+<td>Allocations provided by the regional registry (ARIN, RIPE, LACNIC, AfriNIC, 
+or APNIC)</td>
 </tr>
 
