restructure wiki (again)

27 files changed, 94 insertions, 78 deletions

diff --git a/Index.page b/Index.page
index dea84aa..da0d677 100644
--- a/Index.page
+++ b/Index.page
@@ -14,29 +14,33 @@ the archives [here](http://mailman.rooter.is/mailman/listinfo/talk).
 
 # Proposed System Design
 
-* **[Overview and Features](/design/overview)**
+* **[Overview](/design/overview)**
 * **[Hardware Specifications](/design/hardware)**
 
 # Development Notes
 
-* **[Benchmarks](/benchmarks)** of existing hardware
-* **[User Experience](/user_experience)**
-* **[Operating System](/distribution)**
-* **[Software Services](/services) and [Applications](/applications)**
-* **[Packet Routing](/routing)**
-* **[Quality Assurance](/qa)**: testing and metrics
-* **[Configuration Management](/configuration)**
+* **[User Experience](/dev/user_experience)**
+* **[Quality Assurance](/dev/qa)**: testing and metrics
 * **[Ideas](/ideas)**
 * **[Questions](/questions)** to be resolved
 
-# Links and Other Stuff
+# Background Research
 
+* **[Configuration Management](/dev/configuration)**
+* **[Operating System](/research/distribution)**
+* **[research/benchmarks]()** of existing hardware
+* [research/applications]()
+* [research/services]()
+* [research/devices](): background research of other devices on the market
+  (both commercial and community-based)
+* [research/cpu](): background research of CPU options
+* [research/altnet](): alternative networking (mesh etc)
+
+# Other Stuff
+
+* [funding]()
 * [events](): gatherings of interest in real life
-* [altnet](): alternative networking ([mesh](), etc)
-* [refs](): community resources, other links
-* [hardware/devices](): background research of other devices on the market
-  (commercial and community-based)
-* [hardware/cpu](): background research of CPU options
+* [community](): community resources, complementary projects, other links
 * [unsorted](): links and other projects, not yet organized
 * [All Pages](/_index)
 
diff --git a/refs.page b/community.page
index d5cfa2a..141bc98 100644
--- a/refs.page
+++ b/community.page
@@ -17,15 +17,11 @@ platform?
 
 [owbox](http://www.owbox.com/) 802.15.4 monitoring, french
 
-## Funding
-
-[NLnet](http://nlnet.nl/foundation/can_do.html) in the netherlands gives grants
-for hardware and free internet development.
-
 ## Academic
 
 [secure internet of things](http://www.shahidraza.info/)
-### existing organizations/projects
+
+### Existing organizations/projects
 
 [FreedomBox Foundation](http://freedomboxfoundation.org/)
 
@@ -47,7 +43,7 @@ CJDNS (<http://hyperboria.net/>): decentralized "darknet" routing system
 bufferbloat evaluations:
 <http://www.bufferbloat.net/projects/uberwrt/wiki/Hardware_evaluation>
 
-### existing businesses
+### Existing Commercial Ventures
 
 <http://republicwireless.com/> (hybrid wifi/cellular android phone service,
 $20/month. depends on pervasive wifi)
@@ -63,7 +59,7 @@ markup)
 
 <http://owncloud.com/> (business?)
 
-### misc
+### Misc
 
 bufferbloat: <http://gettys.wordpress.com/2010/12/03/introducing-the-criminal-mastermind-bufferbloat/>
 
diff --git a/design/crude_boms.ods b/design/crude_boms.ods
new file mode 100644
index 0000000..f2669b3
--- /dev/null
+++ b/design/crude_boms.ods
diff --git a/design/hardware.page b/design/hardware.page
index 9bbfd36..bd2f0f2 100644
--- a/design/hardware.page
+++ b/design/hardware.page
@@ -1,4 +1,6 @@
 
+## Hardware Features
+
 Below is the best-guess set of features that a rooter hardware device would
 include; this is a balance between good functionality, engineering feasibility,
 and cost at the 1k or 10k production batch size:
@@ -28,7 +30,12 @@ and cost at the 1k or 10k production batch size:
  - reset button
  - power switch
 
-## BOM
+An alternative "minimal" feature set device is described at
+[design/minimal_design]().
+
+## Proposed BOM (August 2012)
+
+**[CPU](/research/cpu):** Freescale i.mx6 
 
 <table border="0" cellspacing="0" cellpadding="0" class="gridded">
 <tr class="ro1">
@@ -1212,3 +1219,4 @@ and cost at the 1k or 10k production batch size:
 </td>
 </tr>
 </table>
+
diff --git a/design/overview.page b/design/overview.page
index 8dc0269..25fc4a6 100644
--- a/design/overview.page
+++ b/design/overview.page
@@ -45,8 +45,8 @@ protocol (eg 802.15.4 6lowpan, ZigBee, Bluetooth Low-Energy, etc).
 
 See [design/hardware]() for specific components and costs.
 
-- 1GHz dual-core ARM SoC processor
-- 512MB+ RAM
+- 1GHz ARM SoC processor (possibly dual-core)
+- 512MB RAM
 - Internal uSD card storage, expandable through SATA and USB ports
 - Modular WiFI via miniPCIe slot
 - Second USB-only miniPCIe slot for expansion
@@ -58,13 +58,27 @@ See [design/hardware]() for specific components and costs.
 
 ## Comparison
 
+See [research/devices]() for a listing of other similar hardware devices.
+
+**Router?** indicates whether the device meets contemporary first world user
+expectations of a home router.
+
+**Server?** indicates whether the devices meets expectations of web application
+developers: eg, whether a Ruby On Rails web application would run well enough
+for a small group of users.
+
+**Libre?** indicates whether the design of the entire device is truely Free.
+
+**Hack?** indicates whether the device could be integrated into an electronics
+project by an Arduino-experienced hacker.
+
 <table class="gridded" style="width: 1200px;">
  <tr>
   <th style="width:180px;">Device
-  <th style="width:80px;">Price (est.)
+  <th style="width:80px;">Price
   <th style="width:200px;">CPU/RAM/Disk
   <th style="width:100px;">Ethernet
-  <th style="width:200px;">Wireless
+  <th style="width:230px;">Wireless
   <th style="width:80px;">Router?
   <th style="width:80px;">Server?
   <th style="width:180px;">Libre?
@@ -72,64 +86,64 @@ See [design/hardware]() for specific components and costs.
  <tr>
   <td><b>rooter</b><br>with OpenWRT+debian
   <td>$175
-  <td>dual 1GHz ARM / 512MB <br> 8Gb uSD, empty SATA
+  <td>1GHz ARM / 512MB <br> 8Gb uSD, empty SATA
   <td>5x 1000Mbps
-  <td>802.11n 2.4GHz via miniPCIe
-      <br>802.11n 5GHz via miniPCIe
+  <td>802.11n 2.4GHz miniPCIe
+      <br>802.11n 5GHz miniPCIe
       <br>802.15.4
   <td style="background-color: #8F8;" >Yes
   <td style="background-color: #8F8;" >Yes
-  <td style="background-color: #8F8;" >Open Hardware<br>FLOSS software<br>FLOSS drivers 
+  <td style="background-color: #8F8;" >Open Hardware<br>FLOSS software<br>FLOSS drivers<br>FLOSS BIOS
   <td style="background-color: #8F8;" >Serial, JTAG, GPIO, MCU
  <tr>
-  <td><b>DreamPlug</b><br>with FreedomBox/debian
+  <td><b>[DreamPlug](http://www.globalscaletechnologies.com/t-dreamplugdetails.aspx)</b><br>with FreedomBox/debian
   <td>$180
   <td>1.2 GHz ARM / 512MB <br> 4GB uSD, empty eSATA
   <td>2x 1000Mbps
-  <td>802.11 2.4GHz via ???
+  <td>802.11 2.4GHz ???
   <td style="background-color: #FF8;" >Limited
   <td style="background-color: #8F8;" >Yes
-  <td style="background-color: #F88;" >Proprietary Hardware<br>FLOSS software<br>Proprietary drivers
+  <td style="background-color: #F88;" >Proprietary Hardware<br>FLOSS software<br>Binary Blob drivers<br>FLOSS BIOS
   <td style="background-color: #FF8;" >Serial, JTAG
  <tr>
-  <td><b>Raspberry Pi B</b><br>with debian
+  <td><b>[Raspberry Pi B](http://www.raspberrypi.org/)</b><br>with debian
   <td>$35
   <td>700MHz ARM / 256MB <br> empty uSD, ??? SATA
   <td>1x 100Mbps
   <td>empty USB
   <td style="background-color: #F88;" >No
   <td style="background-color: #FF8;" >Limited
-  <td style="background-color: #F88;" >Proprietary Hardware<br>FLOSS software<br>Proprietary drivers (?)
+  <td style="background-color: #F88;" >Almost-Open Hardware<br>FLOSS software<br>Binary Blob drivers<br>no BIOS
   <td style="background-color: #8F8;" >Yup
  <tr>
-  <td><b>Netgear WNDR3700v2</b><br>with OpenWRT
+  <td><b>[Netgear WNDR3700v2](http://www.netgear.com/home/products/wirelessrouters/high-performance/wndr3700.aspx)</b><br>with OpenWRT
   <td>$90
   <td>680MHz MIPS / 64MB <br> 16MB flash
   <td>5x 1000Mbps
-  <td>802.11n 2.4GHz via ???<br>802.11n 5GHz via ???
+  <td>802.11n 2.4GHz ???<br>802.11n 5GHz ???
   <td style="background-color: #8F8;" >Yes
   <td style="background-color: #F88;" >No
-  <td style="background-color: #F88;" >Proprietary Hardware<br>FLOSS software<br>??? drivers
-  <td style="background-color: #F88;" >Expert only
+  <td style="background-color: #F88;" >Proprietary Hardware<br>FLOSS software<br>FLOSS ath9k drivers<br>FLOSS BIOS
+  <td style="background-color: #F88;" >Undocumented, expert only
  <tr>
-  <td><b>Soekris net6501-50</b><br>with debian
-  <td>$300+
+  <td><b>[Soekris net6501-50](http://soekris.com/products/net6501/net6501-50-board-case.html)</b><br>with debian
+  <td>$330
   <td>1GHz Atom x86 / 1GB <br> empty SATA
   <td>4x 1000Mbps
-  <td>empty miniPCIe, USB
+  <td>empty miniPCIe + USB
   <td style="background-color: #8F8;" >Yes
   <td style="background-color: #8F8;" >Yes
-  <td style="background-color: #F88;" >Proprietary Hardware<br>FLOSS software<br>??? drivers
+  <td style="background-color: #F88;" >Proprietary Hardware<br>FLOSS software<br>FLOSS drivers</br>Proprietary BIOS
   <td style="background-color: #8F8;" >Serial, GPIO, FPGA
  <tr>
-  <td><b>Mesh Potato</b><br>with OpenWRT
+  <td><b>[Mesh Potato](http://store.villagetelco.com/mesh-potatoes/mesh-potato.html)</b><br>with OpenWRT
   <td>$100
   <td>180MHz MIPS / 16MB <br> 8MB flash
   <td>1x 100Mbps
-  <td>802.11b/g 2.4GHz via ???
+  <td>802.11b/g 2.4GHz ???
   <td style="background-color: #8F8;" >Limited
-  <td style="background-color: #FF8;" >No
-  <td style="background-color: #8F8;" >Open Hardware<br>FLOSS software<br>FLOSS drivers (?)
-  <td style="background-color: #8F8;" >Yes?
+  <td style="background-color: #F88;" >No
+  <td style="background-color: #8F8;" >Open Hardware<br>FLOSS software<br>Blob drivers<sup>[ref](http://wiki.villagetelco.org/index.php?title=Mesh_Potato_Firmware_How_To#WiFi)</sup><br>FLOSS bootloader
+  <td style="background-color: #8F8;" >MCU, CPLD, Serial, JTAG, [more](http://wiki.villagetelco.org/index.php?title=Mesh_Potato_Features_/_Specs)
 </table>
 
diff --git a/qa.page b/dev/qa.page
index 0db607c..0db607c 100644
--- a/qa.page
+++ b/dev/qa.page
diff --git a/user_experience.page b/dev/user_experience.page
index 465fa7a..465fa7a 100644
--- a/user_experience.page
+++ b/dev/user_experience.page
diff --git a/kickstarter.page b/funding.page
index d1b0c5b..c66e5fc 100644
--- a/kickstarter.page
+++ b/funding.page
@@ -1,5 +1,14 @@
 
-successful open hardware kickstarter projects:
+[NLnet](http://nlnet.nl/foundation/can_do.html) in the netherlands gives grants
+for hardware and free internet development.
+
+HAXLR8R
+
+Mozilla WebFWD
+
+### Kickstarter
+
+List of successful open hardware kickstarter projects:
 
  - teagueduino
  - [ubertooth one](http://www.kickstarter.com/projects/mossmann/ubertooth-one-an-open-source-bluetooth-test-tool) bluetooth sniffer
diff --git a/hardware/specs.page b/hardware/specs.page
deleted file mode 100644
index b5a16e4..0000000
--- a/hardware/specs.page
+++ /dev/null
@@ -1,3 +0,0 @@
-
-# Absolute Minimal Hardware
-
diff --git a/mesh.page b/mesh.page
deleted file mode 100644
index 3c3c7ba..0000000
--- a/mesh.page
+++ /dev/null
@@ -1,6 +0,0 @@
-
-BattleMesh is a mesh networking interop/competition, where developers of
-multiple mesh protocols and stacks (babel, batman, olsr, etc) show up and test
-using OpenWRT on standard hardware.
-
-http://battlemesh.org/BattleMeshV5
diff --git a/principles.page b/principles.page
index 63d80ea..f2f1bdd 100644
--- a/principles.page
+++ b/principles.page
@@ -27,7 +27,6 @@ Avoid rent-seeking behavior in any business model
 
 - don't abuse "control" or trusted position
 
-
 Complete transparency of finances, "partnerships"
 
 Absolutely no licensing or patent issues
diff --git a/altnet.page b/research/altnet.page
index 6dcda4c..01e8440 100644
--- a/altnet.page
+++ b/research/altnet.page
@@ -52,4 +52,6 @@ services over GNUnet and psyc
 
 anoNet (?)
 
-
+BattleMesh is a mesh networking interop/competition, where developers of
+multiple mesh protocols and stacks (babel, batman, olsr, etc) show up and test
+using OpenWRT on standard hardware. <http://battlemesh.org/BattleMeshV5>
diff --git a/applications.page b/research/applications.page
index f31dafd..4209bba 100644
--- a/applications.page
+++ b/research/applications.page
@@ -1,5 +1,6 @@
 
-Some user-facing applications that could run on rooter. See also [services]().
+Some user-facing applications that could run on rooter. See also
+[research/services]().
 
 Unless noted otherwise, these would be optional and not run by default.
 
@@ -23,10 +24,6 @@ What about datastores (SQL, mongo, cdb)?
 * Wiki
 * FAQ/Q&A
 
-## Frameworks
-
-By default, ship with 
-
 ## Privacy 
 
 Proxy: reroute tracking cookies/urchins, block cleartext telnet, ftp, etc. Does
diff --git a/configuration.page b/research/configuration.page
index 0357b79..0357b79 100644
--- a/configuration.page
+++ b/research/configuration.page
diff --git a/hardware/cpu.page b/research/cpu.page
index 187c52a..187c52a 100644
--- a/hardware/cpu.page
+++ b/research/cpu.page
diff --git a/hardware/devices.page b/research/devices.page
index b5f5de7..dbafde4 100644
--- a/hardware/devices.page
+++ b/research/devices.page
@@ -605,7 +605,7 @@ build rural phone systems.
  - One 10/100Mbit LAN port
  - 8 MByte Serial Flash EEPROM
  - 16 MByte RAM
- - 802.11b/g
+ - 802.11b/g Atheros wifi, uses madwifi (blob HAL)
 
 [Next generation planning](http://wiki.villagetelco.org/index.php?title=Next_Generation_MeshPotato)
 
@@ -661,9 +661,6 @@ http://dangerousprototypes.com/docs/Web_Platform
 
 http://boundarydevices.com (single-board computers)
 
-netfpga
-
-### MiniPCIExpress
-
-http://www.unex.com.tw/product/dnxa-92 (wifi)
+netfpga: http://netfpga.org/
 
+miniPCIexpress device: http://www.unex.com.tw/product/dnxa-92 (wifi)
diff --git a/distribution.page b/research/distribution.page
index 665a887..665a887 100644
--- a/distribution.page
+++ b/research/distribution.page
diff --git a/dreamplug.page b/research/dreamplug.page
index e15f167..e15f167 100644
--- a/dreamplug.page
+++ b/research/dreamplug.page
diff --git a/ipv6.page b/research/ipv6.page
index 9911ae2..9911ae2 100644
--- a/ipv6.page
+++ b/research/ipv6.page
diff --git a/hardware/miniPCIe.page b/research/miniPCIe.page
index b7b19b7..b7b19b7 100644
--- a/hardware/miniPCIe.page
+++ b/research/miniPCIe.page
diff --git a/hardware/misc.page b/research/misc_hardware.page
index f0cbb2f..f0cbb2f 100644
--- a/hardware/misc.page
+++ b/research/misc_hardware.page
diff --git a/security.page b/research/security.page
index 14b7524..14b7524 100644
--- a/security.page
+++ b/research/security.page
diff --git a/services.page b/research/services.page
index b05f9cb..0a11c79 100644
--- a/services.page
+++ b/research/services.page
@@ -1,6 +1,6 @@
 
 Some lower-level services and utilities that could run on rooter. See also
-[applications]().
+[research/applications]().
 
 Unless noted otherwise, these would all be optional and not run by default.
 
@@ -20,6 +20,8 @@ OpenVPN, IPSec
 
 [Amon](http://amon.cx/): monitoring and error tracking
 
+monit
+
 ### Local internet graph/map explorer
 
 Explore a graph of router hops outwards. Latency as color? Named by network?
@@ -41,6 +43,8 @@ data/time spent by:
 
 Tahoe-LAFS ([tutorial](https://www.linux.com/learn/tutorials/546799:weekend-project-get-started-with-tahoe-lafs-storage-grids))
 
+git-annex
+
 # References
 
 * [Linode Library](http://library.linode.com/) for installation guides
diff --git a/software.page b/research/software.page
index 49f45e1..49f45e1 100644
--- a/software.page
+++ b/research/software.page
diff --git a/hardware/ti_am335x_notes.txt b/research/ti_am335x_notes.txt
index 1011c62..1011c62 100644
--- a/hardware/ti_am335x_notes.txt
+++ b/research/ti_am335x_notes.txt
diff --git a/unsorted.page b/research/unsorted.page
index 68b9e53..68b9e53 100644
--- a/unsorted.page
+++ b/research/unsorted.page
diff --git a/routing.page b/routing.page
deleted file mode 100644
index 1ed2893..0000000
--- a/routing.page
+++ /dev/null
@@ -1,5 +0,0 @@
-
-Tunnels, VPNs, and meshes are treated as virtual network interfaces, so
-firewall rules and routing policies can can be applied on top of and between
-them.
-