diff --git a/collectd.txtl b/collectd.txtl
index ced1cf8..3a8a020 100644
--- a/collectd.txtl
+++ b/collectd.txtl
@@ -75,7 +75,7 @@ LoadPlugin vmem
 # ription of those options is available in the collectd.conf(5) manual page. #
 ##############################################################################
 <Plugin df>
-	Device "/dev/xvd[a-h][0-9]"
+	Device "/^xvd[a-h][0-9]?/"
 	ReportReserved true
 </Plugin>
 

diff --git a/collectd.txtl b/collectd.txtl
index 6db87e4..ced1cf8 100644
--- a/collectd.txtl
+++ b/collectd.txtl
@@ -119,3 +119,6 @@ LoadPlugin vmem
 	Verbose false
 </Plugin>
 
+p. --
+
+[[!taglink notes]]

diff --git a/collectd.txtl b/collectd.txtl
new file mode 100644
index 0000000..6db87e4
--- /dev/null
+++ b/collectd.txtl
@@ -0,0 +1,121 @@
+h1. Creating a collectd notes page for me and my notes
+
+h2. SMGL init script
+
+bc.. #!/bin/bash
+
+PROGRAM=/usr/sbin/collectd
+RUNLEVEL=3
+NEEDS="+remote_fs"
+
+. /etc/init.d/smgl_init
+
+stop() {
+  echo "Stopping collectd..."
+  if [ -f /var/run/collectd.pid ]; then
+    kill `cat /var/run/collectd.pid`
+  fi
+  evaluate_retval
+}
+
+h2. Simple generic collectd.conf file
+
+
+bc.. #
+# Config file for collectd(1).
+# Please read collectd.conf(5) for a list of options.
+# http://collectd.org/
+#
+
+##############################################################################
+# Global                                                                     #
+#----------------------------------------------------------------------------#
+# Global settings for the daemon.                                            #
+##############################################################################
+
+hostname    "hostname.shlrm.org"
+
+##############################################################################
+# Logging                                                                    #
+#----------------------------------------------------------------------------#
+# Plugins which provide logging functions should be loaded first, so log     #
+# messages generated when loading or configuring other plugins can be        #
+# accessed.                                                                  #
+##############################################################################
+
+LoadPlugin syslog
+
+<Plugin syslog>
+	LogLevel info
+</Plugin>
+
+##############################################################################
+# LoadPlugin section                                                         #
+#----------------------------------------------------------------------------#
+##############################################################################
+
+LoadPlugin cpu
+LoadPlugin df
+LoadPlugin disk
+LoadPlugin entropy
+LoadPlugin interface
+LoadPlugin load
+LoadPlugin memory
+LoadPlugin network
+LoadPlugin processes
+LoadPlugin swap
+LoadPlugin uptime
+LoadPlugin users
+LoadPlugin vmem
+
+##############################################################################
+# Plugin configuration                                                       #
+#----------------------------------------------------------------------------#
+# In this section configuration stubs for each plugin are provided. A desc-  #
+# ription of those options is available in the collectd.conf(5) manual page. #
+##############################################################################
+<Plugin df>
+	Device "/dev/xvd[a-h][0-9]"
+	ReportReserved true
+</Plugin>
+
+<Plugin disk>
+	Disk "/^xvd[a-f][0-9]?$/"
+	IgnoreSelected false
+</Plugin>
+
+<Plugin interface>
+	Interface "eth0"
+	IgnoreSelected false
+</Plugin>
+
+<Plugin network>
+	# client setup:
+	Server "10.10.220.225"
+	TimeToLive 128
+
+	# statistics about the network plugin itself
+	ReportStats true
+
+	# "garbage collection"
+	CacheFlush 1800
+</Plugin>
+
+#<Plugin ping>
+#	Host "host.foo.bar"
+#	Interval 1.0
+#	Timeout 0.9
+#	TTL 255
+#	SourceAddress "1.2.3.4"
+#	Device "eth0"
+#	MaxMissed -1
+#</Plugin>
+
+#<Plugin processes>
+#	Process "name"
+#</Plugin>
+
+<Plugin vmem>
+	Verbose false
+</Plugin>
+

diff --git a/ComputerStuffForSale.txtl b/ComputerStuffForSale.txtl
index b2bf021..fe77b05 100644
--- a/ComputerStuffForSale.txtl
+++ b/ComputerStuffForSale.txtl
@@ -1,8 +1,8 @@
-h1. $225 to buy it all!
+h1. $175 to buy it all!
 
-I have stuff! You want it!
+Would like for it all to go away :D So make me an offer, I might take it.
 
-h1. Antec Tower box - $100
+h1. Antec Tower box - $75
 
 * Dual Intel Xeon 2.40Ghz
 * Motherboard: "Tyan Tiger":http://www.tyan.com/product_board_detail.aspx?pid=19
@@ -15,7 +15,7 @@ h1. Antec Tower box - $100
 Boots, but lacks harddrive, so no OS
 
 
-h1. Older Computer Full of SCSI drives - $50
+h1. Older Computer Full of SCSI drives - $40
 
 * 6x SCSI drives 9.8GB
 * IDE CD Drive
@@ -26,7 +26,7 @@ h1. Older Computer Full of SCSI drives - $50
 * root password: sourcemage
 * Generic Case
 
-h1. Dell Poweredge 2500 - $100
+h1. Dell Poweredge 2500 - $75
 
 * Dual 1Ghz P3
 * 3x18GB SCSI drives
@@ -36,29 +36,18 @@ h1. Dell Poweredge 2500 - $100
 * Running SourceMage linux 
 * root password: sourcemage
 
-h1. Video Conferencing Computer thing - $50
+h1. Video Conferencing Computer thing - $40
 
 I never put it together, it's got a pile of video conferencing things that I don't even know if they work.
 *$50 for it and all the stuff*
 
-h1. Cisco Catalyst 1900 - $20
+h1. Cisco Catalyst 1900 - $15
 
 * 24x 10Mbit switch with 2x 100Mbit uplink ports
 Also never really used
 
-h1. 48 Port Terminal Server with Ram Disk - $30
+h1. 48 Port Terminal Server with Ram Disk - $20
 
 maxserver 1650 It's got the memory card.
 
-
-h1. -Palm LifeDrive & travel Kit - $50-
-
-h1. -Other Dual Xeon box - $125-
-
-h1. -HP Pro Curve 4000m Switch - $35-
-
-* -6x 100Mbit Interface modules with 8x100mbit rj45 Jacks-
-* -Single Power supply-
-* -Fan module seems to be "broke" but the fans certainly work, just run full blast-
-
-
+"This is the thing":http://www.uyangastore.com/monitors.html?page=shop.product_details&product_id=324&flypage=flypage.tpl&pop=0

diff --git a/ComputerStuffForSale.txtl b/ComputerStuffForSale.txtl
index 98bb4f4..b2bf021 100644
--- a/ComputerStuffForSale.txtl
+++ b/ComputerStuffForSale.txtl
@@ -1,8 +1,8 @@
-h1. $300 to buy it all!
+h1. $225 to buy it all!
 
 I have stuff! You want it!
 
-h1. Antec Tower box - $150
+h1. Antec Tower box - $100
 
 * Dual Intel Xeon 2.40Ghz
 * Motherboard: "Tyan Tiger":http://www.tyan.com/product_board_detail.aspx?pid=19
@@ -15,7 +15,7 @@ h1. Antec Tower box - $150
 Boots, but lacks harddrive, so no OS
 
 
-h1. Older Computer Full of SCSI drives - $75
+h1. Older Computer Full of SCSI drives - $50
 
 * 6x SCSI drives 9.8GB
 * IDE CD Drive
@@ -26,17 +26,7 @@ h1. Older Computer Full of SCSI drives - $75
 * root password: sourcemage
 * Generic Case
 
-h1. Other Dual Xeon box - $125
-
-* Dual Intel Xeon 2.40Ghz
-* Motherboard: "Tyan Tiger":http://www.tyan.com/product_board_detail.aspx?pid=19
-* RAM:2G 
-* No harddrive
-* Mid-Tower Case 
-* Antec True Power 430Watt
-* DVD drive
-
-h1. Dell Poweredge 2500 - $125
+h1. Dell Poweredge 2500 - $100
 
 * Dual 1Ghz P3
 * 3x18GB SCSI drives
@@ -51,13 +41,6 @@ h1. Video Conferencing Computer thing - $50
 I never put it together, it's got a pile of video conferencing things that I don't even know if they work.
 *$50 for it and all the stuff*
 
-h1. -HP Pro Curve 4000m Switch - $35-
-
-* -6x 100Mbit Interface modules with 8x100mbit rj45 Jacks-
-* -Single Power supply-
-* -Fan module seems to be "broke" but the fans certainly work, just run full blast-
-
-
 h1. Cisco Catalyst 1900 - $20
 
 * 24x 10Mbit switch with 2x 100Mbit uplink ports
@@ -69,3 +52,13 @@ maxserver 1650 It's got the memory card.
 
 
 h1. -Palm LifeDrive & travel Kit - $50-
+
+h1. -Other Dual Xeon box - $125-
+
+h1. -HP Pro Curve 4000m Switch - $35-
+
+* -6x 100Mbit Interface modules with 8x100mbit rj45 Jacks-
+* -Single Power supply-
+* -Fan module seems to be "broke" but the fans certainly work, just run full blast-
+
+

diff --git a/ComputerStuffForSale.txtl b/ComputerStuffForSale.txtl
index 058a6fa..98bb4f4 100644
--- a/ComputerStuffForSale.txtl
+++ b/ComputerStuffForSale.txtl
@@ -1,3 +1,5 @@
+h1. $300 to buy it all!
+
 I have stuff! You want it!
 
 h1. Antec Tower box - $150

diff --git a/ComputerStuffForSale.txtl b/ComputerStuffForSale.txtl
index 2f74768..058a6fa 100644
--- a/ComputerStuffForSale.txtl
+++ b/ComputerStuffForSale.txtl
@@ -66,4 +66,4 @@ h1. 48 Port Terminal Server with Ram Disk - $30
 maxserver 1650 It's got the memory card.
 
 
-h1. Palm LifeDrive & travel Kit - $50
+h1. -Palm LifeDrive & travel Kit - $50-

diff --git a/ComputerStuffForSale.txtl b/ComputerStuffForSale.txtl
index 4564d44..2f74768 100644
--- a/ComputerStuffForSale.txtl
+++ b/ComputerStuffForSale.txtl
@@ -49,11 +49,11 @@ h1. Video Conferencing Computer thing - $50
 I never put it together, it's got a pile of video conferencing things that I don't even know if they work.
 *$50 for it and all the stuff*
 
-h1. HP Pro Curve 4000m Switch - $35
+h1. -HP Pro Curve 4000m Switch - $35-
 
-*6x 100Mbit Interface modules with 8x100mbit rj45 Jacks
-*Single Power supply
-*Fan module seems to be "broke" but the fans certainly work, just run full blast
+* -6x 100Mbit Interface modules with 8x100mbit rj45 Jacks-
+* -Single Power supply-
+* -Fan module seems to be "broke" but the fans certainly work, just run full blast-
 
 
 h1. Cisco Catalyst 1900 - $20

diff --git a/ComputerStuffForSale.txtl b/ComputerStuffForSale.txtl
index 7fdb4c7..4564d44 100644
--- a/ComputerStuffForSale.txtl
+++ b/ComputerStuffForSale.txtl
@@ -1,4 +1,4 @@
-I have crap. You want it!
+I have stuff! You want it!
 
 h1. Antec Tower box - $150
 

diff --git a/ComputerStuffForSale.txtl b/ComputerStuffForSale.txtl
index 963996b..7fdb4c7 100644
--- a/ComputerStuffForSale.txtl
+++ b/ComputerStuffForSale.txtl
@@ -3,7 +3,7 @@ I have crap. You want it!
 h1. Antec Tower box - $150
 
 * Dual Intel Xeon 2.40Ghz
-* Motherboard: Tyan Tiger 
+* Motherboard: "Tyan Tiger":http://www.tyan.com/product_board_detail.aspx?pid=19
 * RAM:2G 
 * No harddrive
 * Two CD drives
@@ -27,7 +27,7 @@ h1. Older Computer Full of SCSI drives - $75
 h1. Other Dual Xeon box - $125
 
 * Dual Intel Xeon 2.40Ghz
-* Motherboard: Tyan Tiger 
+* Motherboard: "Tyan Tiger":http://www.tyan.com/product_board_detail.aspx?pid=19
 * RAM:2G 
 * No harddrive
 * Mid-Tower Case 

diff --git a/ComputerCrapForSale.txtl b/ComputerCrapForSale.txtl
deleted file mode 100644
index 963996b..0000000
--- a/ComputerCrapForSale.txtl
+++ /dev/null
@@ -1,69 +0,0 @@
-I have crap. You want it!
-
-h1. Antec Tower box - $150
-
-* Dual Intel Xeon 2.40Ghz
-* Motherboard: Tyan Tiger 
-* RAM:2G 
-* No harddrive
-* Two CD drives
-* Antec Full tower case w/ 2x80mm fans for exhaust
-* Antec True Power Trio Power supply 550W
-
-Boots, but lacks harddrive, so no OS
-
-
-h1. Older Computer Full of SCSI drives - $75
-
-* 6x SCSI drives 9.8GB
-* IDE CD Drive
-* Pentium 3 500Mhz
-* 256MB RAM
-* Onboard Adaptec SCSI
-* Running Source Mage linux SCSI drives are in raid 10
-* root password: sourcemage
-* Generic Case
-
-h1. Other Dual Xeon box - $125
-
-* Dual Intel Xeon 2.40Ghz
-* Motherboard: Tyan Tiger 
-* RAM:2G 
-* No harddrive
-* Mid-Tower Case 
-* Antec True Power 430Watt
-* DVD drive
-
-h1. Dell Poweredge 2500 - $125
-
-* Dual 1Ghz P3
-* 3x18GB SCSI drives
-* 1GB ram
-* Slim CD drive
-* Slim Floppy
-* Running SourceMage linux 
-* root password: sourcemage
-
-h1. Video Conferencing Computer thing - $50
-
-I never put it together, it's got a pile of video conferencing things that I don't even know if they work.
-*$50 for it and all the stuff*
-
-h1. HP Pro Curve 4000m Switch - $35
-
-*6x 100Mbit Interface modules with 8x100mbit rj45 Jacks
-*Single Power supply
-*Fan module seems to be "broke" but the fans certainly work, just run full blast
-
-
-h1. Cisco Catalyst 1900 - $20
-
-* 24x 10Mbit switch with 2x 100Mbit uplink ports
-Also never really used
-
-h1. 48 Port Terminal Server with Ram Disk - $30
-
-maxserver 1650 It's got the memory card.
-
-
-h1. Palm LifeDrive & travel Kit - $50
diff --git a/ComputerStuffForSale.txtl b/ComputerStuffForSale.txtl
new file mode 100644
index 0000000..963996b
--- /dev/null
+++ b/ComputerStuffForSale.txtl
@@ -0,0 +1,69 @@
+I have crap. You want it!
+
+h1. Antec Tower box - $150
+
+* Dual Intel Xeon 2.40Ghz
+* Motherboard: Tyan Tiger 
+* RAM:2G 
+* No harddrive
+* Two CD drives
+* Antec Full tower case w/ 2x80mm fans for exhaust
+* Antec True Power Trio Power supply 550W
+
+Boots, but lacks harddrive, so no OS
+
+
+h1. Older Computer Full of SCSI drives - $75
+
+* 6x SCSI drives 9.8GB
+* IDE CD Drive
+* Pentium 3 500Mhz
+* 256MB RAM
+* Onboard Adaptec SCSI
+* Running Source Mage linux SCSI drives are in raid 10
+* root password: sourcemage
+* Generic Case
+
+h1. Other Dual Xeon box - $125
+
+* Dual Intel Xeon 2.40Ghz
+* Motherboard: Tyan Tiger 
+* RAM:2G 
+* No harddrive
+* Mid-Tower Case 
+* Antec True Power 430Watt
+* DVD drive
+
+h1. Dell Poweredge 2500 - $125
+
+* Dual 1Ghz P3
+* 3x18GB SCSI drives
+* 1GB ram
+* Slim CD drive
+* Slim Floppy
+* Running SourceMage linux 
+* root password: sourcemage
+
+h1. Video Conferencing Computer thing - $50
+
+I never put it together, it's got a pile of video conferencing things that I don't even know if they work.
+*$50 for it and all the stuff*
+
+h1. HP Pro Curve 4000m Switch - $35
+
+*6x 100Mbit Interface modules with 8x100mbit rj45 Jacks
+*Single Power supply
+*Fan module seems to be "broke" but the fans certainly work, just run full blast
+
+
+h1. Cisco Catalyst 1900 - $20
+
+* 24x 10Mbit switch with 2x 100Mbit uplink ports
+Also never really used
+
+h1. 48 Port Terminal Server with Ram Disk - $30
+
+maxserver 1650 It's got the memory card.
+
+
+h1. Palm LifeDrive & travel Kit - $50

diff --git a/ComputerCrapForSale.txtl b/ComputerCrapForSale.txtl
index e42295d..963996b 100644
--- a/ComputerCrapForSale.txtl
+++ b/ComputerCrapForSale.txtl
@@ -1,6 +1,6 @@
 I have crap. You want it!
 
-h1. Antec Tower box
+h1. Antec Tower box - $150
 
 * Dual Intel Xeon 2.40Ghz
 * Motherboard: Tyan Tiger 
@@ -12,9 +12,8 @@ h1. Antec Tower box
 
 Boots, but lacks harddrive, so no OS
 
-*$150*
 
-h1. Older Computer Full of SCSI drives
+h1. Older Computer Full of SCSI drives - $75
 
 * 6x SCSI drives 9.8GB
 * IDE CD Drive
@@ -25,9 +24,7 @@ h1. Older Computer Full of SCSI drives
 * root password: sourcemage
 * Generic Case
 
-*$75*
-
-h1. Other Dual Xeon box
+h1. Other Dual Xeon box - $125
 
 * Dual Intel Xeon 2.40Ghz
 * Motherboard: Tyan Tiger 
@@ -37,9 +34,7 @@ h1. Other Dual Xeon box
 * Antec True Power 430Watt
 * DVD drive
 
-*$125*
-
-h1. Dell Poweredge 2500
+h1. Dell Poweredge 2500 - $125
 
 * Dual 1Ghz P3
 * 3x18GB SCSI drives
@@ -49,35 +44,26 @@ h1. Dell Poweredge 2500
 * Running SourceMage linux 
 * root password: sourcemage
 
-*$125*
-
-h1. Video Conferencing Computer thing
+h1. Video Conferencing Computer thing - $50
 
 I never put it together, it's got a pile of video conferencing things that I don't even know if they work.
 *$50 for it and all the stuff*
 
-h1. HP Pro Curve 4000m Switch
+h1. HP Pro Curve 4000m Switch - $35
 
 *6x 100Mbit Interface modules with 8x100mbit rj45 Jacks
 *Single Power supply
 *Fan module seems to be "broke" but the fans certainly work, just run full blast
 
-*$35*
 
-h1. Cisco Catalyst 1900
+h1. Cisco Catalyst 1900 - $20
 
 * 24x 10Mbit switch with 2x 100Mbit uplink ports
 Also never really used
 
-*$20*
-
-h1. 48 Port Terminal Server with Ram Disk
+h1. 48 Port Terminal Server with Ram Disk - $30
 
 maxserver 1650 It's got the memory card.
 
-*$30*
-
-
-h1. Palm LifeDrive & travel Kit
 
-*$50*
+h1. Palm LifeDrive & travel Kit - $50

diff --git a/ComputerCrapForSale.txtl b/ComputerCrapForSale.txtl
index f1c89f3..e42295d 100644
--- a/ComputerCrapForSale.txtl
+++ b/ComputerCrapForSale.txtl
@@ -1,6 +1,7 @@
 I have crap. You want it!
 
 h1. Antec Tower box
+
 * Dual Intel Xeon 2.40Ghz
 * Motherboard: Tyan Tiger 
 * RAM:2G 
@@ -14,6 +15,7 @@ Boots, but lacks harddrive, so no OS
 *$150*
 
 h1. Older Computer Full of SCSI drives
+
 * 6x SCSI drives 9.8GB
 * IDE CD Drive
 * Pentium 3 500Mhz
@@ -26,6 +28,7 @@ h1. Older Computer Full of SCSI drives
 *$75*
 
 h1. Other Dual Xeon box
+
 * Dual Intel Xeon 2.40Ghz
 * Motherboard: Tyan Tiger 
 * RAM:2G 
@@ -37,6 +40,7 @@ h1. Other Dual Xeon box
 *$125*
 
 h1. Dell Poweredge 2500
+
 * Dual 1Ghz P3
 * 3x18GB SCSI drives
 * 1GB ram
@@ -48,10 +52,12 @@ h1. Dell Poweredge 2500
 *$125*
 
 h1. Video Conferencing Computer thing
+
 I never put it together, it's got a pile of video conferencing things that I don't even know if they work.
 *$50 for it and all the stuff*
 
 h1. HP Pro Curve 4000m Switch
+
 *6x 100Mbit Interface modules with 8x100mbit rj45 Jacks
 *Single Power supply
 *Fan module seems to be "broke" but the fans certainly work, just run full blast
@@ -59,17 +65,19 @@ h1. HP Pro Curve 4000m Switch
 *$35*
 
 h1. Cisco Catalyst 1900
+
 * 24x 10Mbit switch with 2x 100Mbit uplink ports
 Also never really used
 
 *$20*
 
 h1. 48 Port Terminal Server with Ram Disk
+
 maxserver 1650 It's got the memory card.
 
-$30
+*$30*
 
 
 h1. Palm LifeDrive & travel Kit
 
-$50
+*$50*

diff --git a/ComputerCrapForSale.txtl b/ComputerCrapForSale.txtl
new file mode 100644
index 0000000..f1c89f3
--- /dev/null
+++ b/ComputerCrapForSale.txtl
@@ -0,0 +1,75 @@
+I have crap. You want it!
+
+h1. Antec Tower box
+* Dual Intel Xeon 2.40Ghz
+* Motherboard: Tyan Tiger 
+* RAM:2G 
+* No harddrive
+* Two CD drives
+* Antec Full tower case w/ 2x80mm fans for exhaust
+* Antec True Power Trio Power supply 550W
+
+Boots, but lacks harddrive, so no OS
+
+*$150*
+
+h1. Older Computer Full of SCSI drives
+* 6x SCSI drives 9.8GB
+* IDE CD Drive
+* Pentium 3 500Mhz
+* 256MB RAM
+* Onboard Adaptec SCSI
+* Running Source Mage linux SCSI drives are in raid 10
+* root password: sourcemage
+* Generic Case
+
+*$75*
+
+h1. Other Dual Xeon box
+* Dual Intel Xeon 2.40Ghz
+* Motherboard: Tyan Tiger 
+* RAM:2G 
+* No harddrive
+* Mid-Tower Case 
+* Antec True Power 430Watt
+* DVD drive
+
+*$125*
+
+h1. Dell Poweredge 2500
+* Dual 1Ghz P3
+* 3x18GB SCSI drives
+* 1GB ram
+* Slim CD drive
+* Slim Floppy
+* Running SourceMage linux 
+* root password: sourcemage
+
+*$125*
+
+h1. Video Conferencing Computer thing
+I never put it together, it's got a pile of video conferencing things that I don't even know if they work.
+*$50 for it and all the stuff*
+
+h1. HP Pro Curve 4000m Switch
+*6x 100Mbit Interface modules with 8x100mbit rj45 Jacks
+*Single Power supply
+*Fan module seems to be "broke" but the fans certainly work, just run full blast
+
+*$35*
+
+h1. Cisco Catalyst 1900
+* 24x 10Mbit switch with 2x 100Mbit uplink ports
+Also never really used
+
+*$20*
+
+h1. 48 Port Terminal Server with Ram Disk
+maxserver 1650 It's got the memory card.
+
+$30
+
+
+h1. Palm LifeDrive & travel Kit
+
+$50

diff --git a/runiq/yaml/samples.mdwn b/runiq/yaml/samples.mdwn
index 2dc8701..baee521 100644
--- a/runiq/yaml/samples.mdwn
+++ b/runiq/yaml/samples.mdwn
@@ -45,3 +45,13 @@ This example shows how you could specify the configuration for a spell that woul
 
 ## Spell with configuration
 
+		name: simple3
+		version: 1.2.3
+		main_urls:
+		 - http://www.example.com/${name}/${version}/${main_source}
+		main_verification: sha512:blablabla
+		entered: 20110101
+		short: short description
+		description: |
+		  Longer description of the spell that I've made here.
+

diff --git a/SourceMage/Sorcery2.txtl b/SourceMage/Sorcery2.txtl
index 790247f..debe470 100644
--- a/SourceMage/Sorcery2.txtl
+++ b/SourceMage/Sorcery2.txtl
@@ -12,19 +12,19 @@ h2. Test Driven Development or Behavior Driven Development
 
 To me, the easiest way to ensure that software doesn't break is to have good tests, and to have high test coverage. By doing TDD(Test Driven Development), you can guarantee that you've got both good tests and high test coverage. No functional code is written until the test is written and the test fails. This is important. The test must fail first to ensure that you're actually testing for the right things. You could easily make a typo in your test and make changes to the code and it passes, but it never failed first, so you don't know if you actually fixed anything. Also, with TDD it's very easy to ensure that you don't regress any tests, as the entire test suite can be run again, and old functionality will still work. It makes it easier to hit feature goals and keep development focused.
 
-h2. Application to SourceMage
+h2. Application to Source Mage
 
-SourceMage needs focus. We need planned releases, and planned features, and a path to those goals. We need our core package management system and libraries to be verified, and covered well. Having such things makes it easier to accept contributions from anyone. Only stipulation is that a test must be submitted with the contribution that verifies your functionality, and that all other tests don't fail. Unless of course, you're changing core functionality, at which point the old tests should fail and a new test should be submitted to demonstrate the new functionality. At this point, new integration tests would exist, and a new major release would happen (since compatibility is being broken.) Upgrade paths and such are outside of the scope of testing. Good tests and TDD will result in faster turn around times for Sorcery releases as a side effect of keeping focused on what goes into a release, and when one knows its working.
+Source Mage needs focus. We need planned releases, and planned features, and a path to those goals. We need our core package management system and libraries to be verified, and covered well. Having such things makes it easier to accept contributions from anyone. Only stipulation is that a test must be submitted with the contribution that verifies your functionality, and that all other tests don't fail. Unless of course, you're changing core functionality, at which point the old tests should fail and a new test should be submitted to demonstrate the new functionality. At this point, new integration tests would exist, and a new major release would happen (since compatibility is being broken.) Upgrade paths and such are outside of the scope of testing. Good tests and TDD will result in faster turn around times for Sorcery releases as a side effect of keeping focused on what goes into a release, and when one knows its working.
 
 h2. Decisions for Sourcemage
 
-SourceMage should be written in a language that satisfies the above. Bash is not particularly well suited to doing this, unless we can get volunteers to specifically design, test, and implement a testing framework to exercise it. I do not believe that is the best use of developer time. This does not mean that I want to change the "feature" of easily editing the spell files, and maybe even the core sorcery libraries. However, I believe that such editing shouldn't be necessary. Having to do such edits is a symptom of a problem that can be solved by having good tests. If the editing is due to a feature not existing yet, there are ways to enable that as well. Github forks of sorcery with patches applied is a possible solution. When those forks are complete with tests documenting the feature, they can be integrated into the main Sorcery and released.
+Source Mage should be written in a language that satisfies the above. Bash is not particularly well suited to doing this, unless we can get volunteers to specifically design, test, and implement a testing framework to exercise it. I do not believe that is the best use of developer time. This does not mean that I want to change the "feature" of easily editing the spell files, and maybe even the core sorcery libraries. However, I believe that such editing shouldn't be necessary. Having to do such edits is a symptom of a problem that can be solved by having good tests. If the editing is due to a feature not existing yet, there are ways to enable that as well. Github forks of sorcery with patches applied is a possible solution. When those forks are complete with tests documenting the feature, they can be integrated into the main Sorcery and released.
 
 Sorcery has been written in bash since the beginning. To be honest, I don't know the precise reasoning, perhaps machines were slower, perhaps it was easier to make quick hacks to the source code to fix a bug. Perhaps it was simply preference. I think for long term maintenance of the project a new language needs to be chosen. A language that has robust, descriptive, and automated testing frameworks and good custom DSL(Domain Specific Language) abilities.
 
 h3. Robust, Descriptive, Automated Testing Frameworks
 
-Testing is often difficult. TDD makes it easier once you get your head around the idea. Descriptive testing frameworks are critical to making tests easy to understand and easy to implement. This same test framework must be automated so that all the test can be run by any developer at any time. Specifically before committing the source code both to ensure that your newly implemented feature actually does what you expect, and that no old features have been broken. Also, this would allow thew software to be entered into a Continuous Integration system that will continuously run the tests and ensure the stability of your software. Helps to catch when people forget to run the tests as well. All of this will result in better, more reliable software. Building such a framework for bash is non-trivial, and, I believe, outside the scope of SourceMage. I think its a waste of developer time to build such things when we should be working on improving sorcery. Well written tests in a descriptive test language can be very useful developer documentation, as well as providing verification of the software's functionality.
+Testing is often difficult. TDD makes it easier once you get your head around the idea. Descriptive testing frameworks are critical to making tests easy to understand and easy to implement. This same test framework must be automated so that all the test can be run by any developer at any time. Specifically before committing the source code both to ensure that your newly implemented feature actually does what you expect, and that no old features have been broken. Also, this would allow thew software to be entered into a Continuous Integration system that will continuously run the tests and ensure the stability of your software. Helps to catch when people forget to run the tests as well. All of this will result in better, more reliable software. Building such a framework for bash is non-trivial, and, I believe, outside the scope of Source Mage. I think its a waste of developer time to build such things when we should be working on improving sorcery. Well written tests in a descriptive test language can be very useful developer documentation, as well as providing verification of the software's functionality.
 
 h3. Custom Domain Specific Language
 
@@ -36,6 +36,6 @@ I propose that we use another language, preferably interpreted (although, if a c
 
 h2. Addendum
 
-I'm not completely fixed on using Ruby, however, if SourceMage does go with Ruby, I will be able to do much more work than I would be otherwise. My current job affords me time to write ruby code, and working on an Open Source Linux distro with Ruby and the testing frameworks would be a decent use of my spare time at work. I'm uncertain I would have sufficient time to learn Python sufficiently to be effective with it, given the limited free time I have. If someone else chooses to head up this task, I'll hold them to the same standards I would hold myself: Tests must be written for all new features implemented, and we must have the project in some sort of continuous integration to verify the builds. 
+I'm not completely fixed on using Ruby, however, if Source Mage does go with Ruby, I will be able to do much more work than I would be otherwise. My current job affords me time to write ruby code, and working on an Open Source Linux distro with Ruby and the testing frameworks would be a decent use of my spare time at work. I'm uncertain I would have sufficient time to learn Python sufficiently to be effective with it, given the limited free time I have. If someone else chooses to head up this task, I'll hold them to the same standards I would hold myself: Tests must be written for all new features implemented, and we must have the project in some sort of continuous integration to verify the builds. 
 
 [[!tag SourceMage]]

diff --git a/SourceMage/Sorcery2.txtl b/SourceMage/Sorcery2.txtl
index 4120d3f..790247f 100644
--- a/SourceMage/Sorcery2.txtl
+++ b/SourceMage/Sorcery2.txtl
@@ -37,3 +37,5 @@ I propose that we use another language, preferably interpreted (although, if a c
 h2. Addendum
 
 I'm not completely fixed on using Ruby, however, if SourceMage does go with Ruby, I will be able to do much more work than I would be otherwise. My current job affords me time to write ruby code, and working on an Open Source Linux distro with Ruby and the testing frameworks would be a decent use of my spare time at work. I'm uncertain I would have sufficient time to learn Python sufficiently to be effective with it, given the limited free time I have. If someone else chooses to head up this task, I'll hold them to the same standards I would hold myself: Tests must be written for all new features implemented, and we must have the project in some sort of continuous integration to verify the builds. 
+
+[[!tag SourceMage]]

diff --git a/SourceMage/Sorcery2.txtl b/SourceMage/Sorcery2.txtl
new file mode 100644
index 0000000..4120d3f
--- /dev/null
+++ b/SourceMage/Sorcery2.txtl
@@ -0,0 +1,39 @@
+h2. Development Motivations
+
+Sorcery is the core of the Source Mage distro. It handles everything. It needs to be stable, have good tests, with good test coverage and be reliable.
+
+h2. Test Motivation
+
+Sorcery needs to be driven by tests. Both unit tests and integration tests.
+A good unit test should describe how a specific module (or segment of code) should function. A collection of tests should describe how the code in general works. Unit tests should be short, succinct, test only one thing at a time, and attempt to test in isolation.
+A good integration test should exercise the system from a user's point of view. Providing the necessary setup, exercise, and teardown steps, so that the other integration tests can operate on a known beginning point.
+
+h2. Test Driven Development or Behavior Driven Development
+
+To me, the easiest way to ensure that software doesn't break is to have good tests, and to have high test coverage. By doing TDD(Test Driven Development), you can guarantee that you've got both good tests and high test coverage. No functional code is written until the test is written and the test fails. This is important. The test must fail first to ensure that you're actually testing for the right things. You could easily make a typo in your test and make changes to the code and it passes, but it never failed first, so you don't know if you actually fixed anything. Also, with TDD it's very easy to ensure that you don't regress any tests, as the entire test suite can be run again, and old functionality will still work. It makes it easier to hit feature goals and keep development focused.
+
+h2. Application to SourceMage
+
+SourceMage needs focus. We need planned releases, and planned features, and a path to those goals. We need our core package management system and libraries to be verified, and covered well. Having such things makes it easier to accept contributions from anyone. Only stipulation is that a test must be submitted with the contribution that verifies your functionality, and that all other tests don't fail. Unless of course, you're changing core functionality, at which point the old tests should fail and a new test should be submitted to demonstrate the new functionality. At this point, new integration tests would exist, and a new major release would happen (since compatibility is being broken.) Upgrade paths and such are outside of the scope of testing. Good tests and TDD will result in faster turn around times for Sorcery releases as a side effect of keeping focused on what goes into a release, and when one knows its working.
+
+h2. Decisions for Sourcemage
+
+SourceMage should be written in a language that satisfies the above. Bash is not particularly well suited to doing this, unless we can get volunteers to specifically design, test, and implement a testing framework to exercise it. I do not believe that is the best use of developer time. This does not mean that I want to change the "feature" of easily editing the spell files, and maybe even the core sorcery libraries. However, I believe that such editing shouldn't be necessary. Having to do such edits is a symptom of a problem that can be solved by having good tests. If the editing is due to a feature not existing yet, there are ways to enable that as well. Github forks of sorcery with patches applied is a possible solution. When those forks are complete with tests documenting the feature, they can be integrated into the main Sorcery and released.
+
+Sorcery has been written in bash since the beginning. To be honest, I don't know the precise reasoning, perhaps machines were slower, perhaps it was easier to make quick hacks to the source code to fix a bug. Perhaps it was simply preference. I think for long term maintenance of the project a new language needs to be chosen. A language that has robust, descriptive, and automated testing frameworks and good custom DSL(Domain Specific Language) abilities.
+
+h3. Robust, Descriptive, Automated Testing Frameworks
+
+Testing is often difficult. TDD makes it easier once you get your head around the idea. Descriptive testing frameworks are critical to making tests easy to understand and easy to implement. This same test framework must be automated so that all the test can be run by any developer at any time. Specifically before committing the source code both to ensure that your newly implemented feature actually does what you expect, and that no old features have been broken. Also, this would allow thew software to be entered into a Continuous Integration system that will continuously run the tests and ensure the stability of your software. Helps to catch when people forget to run the tests as well. All of this will result in better, more reliable software. Building such a framework for bash is non-trivial, and, I believe, outside the scope of SourceMage. I think its a waste of developer time to build such things when we should be working on improving sorcery. Well written tests in a descriptive test language can be very useful developer documentation, as well as providing verification of the software's functionality.
+
+h3. Custom Domain Specific Language
+
+The ability to easily define our own functions and logic to use within spell files is critical. This will both keep spellwriting simple, empowering spell authors as we've done in the past using bash functions, and provide new features easier. Using a DSL we can do more than we can with bash functions. Nested constructs and scope adjustments make things like declarative config much easier to implement. DSLs could also eventually be extended to the BUILD and INSTALL phases of spell management. Potentially even configuration of sorcery in general. The possibilities are endless, but it needs to be used wisely. Too much abstraction can result in confusing files and confusing code. Good test coverage is, of course, important to describe the behavior of the DSL and good integration tests demonstrate the functionality.
+
+h2. Implementation
+
+I propose that we use another language, preferably interpreted (although, if a compiled language can meet the requirements for testing, that wouldn't be rejected [and it has other advantages, like static compilation]) that the new version of Sorcery should be written in. I am partial to Ruby (as those of those who know me already know ;) ). Ruby has excellent testing frameworks and an excellent custom DSL creation abilities. This will contribute to making spell files that are easy to use and edit. "Rspec":http://relishapp.com/rspec is one of them. Rspec is best for doing Unit Tests, and provides description of how software modules should behave. The other, more user friendly one is "Cucumber":http://cukes.info/ . Cucumber provides an end-user readable integration test that translates directly into executable steps to exercise your program. Those are the Ruby specific ones, and I think cucumber even works with other languages, such as Python and Java.
+
+h2. Addendum
+
+I'm not completely fixed on using Ruby, however, if SourceMage does go with Ruby, I will be able to do much more work than I would be otherwise. My current job affords me time to write ruby code, and working on an Open Source Linux distro with Ruby and the testing frameworks would be a decent use of my spare time at work. I'm uncertain I would have sufficient time to learn Python sufficiently to be effective with it, given the limited free time I have. If someone else chooses to head up this task, I'll hold them to the same standards I would hold myself: Tests must be written for all new features implemented, and we must have the project in some sort of continuous integration to verify the builds. 

diff --git a/Fedora/2011PMTestDay.textile b/Fedora/2011PMTestDay.textile
deleted file mode 100644
index b99ebf9..0000000
--- a/Fedora/2011PMTestDay.textile
+++ /dev/null
@@ -1 +0,0 @@
-h1. A sample
diff --git a/Fedora/2011PMTestDay.txtl b/Fedora/2011PMTestDay.txtl
new file mode 100644
index 0000000..b99ebf9
--- /dev/null
+++ b/Fedora/2011PMTestDay.txtl
@@ -0,0 +1 @@
+h1. A sample

diff --git a/Fedora/2011PMTestDay.textile b/Fedora/2011PMTestDay.textile
new file mode 100644
index 0000000..b99ebf9
--- /dev/null
+++ b/Fedora/2011PMTestDay.textile
@@ -0,0 +1 @@
+h1. A sample

diff --git a/fedora/2011pmtestday.mdwn b/fedora/2011pmtestday.mdwn
deleted file mode 100644
index 1c96668..0000000
--- a/fedora/2011pmtestday.mdwn
+++ /dev/null
@@ -1,36 +0,0 @@
-# PM Test Day Results!
-
-## lspci output
-
-    00:00.0 Host bridge: Intel Corporation Mobile 4 Series Chipset Memory Controller Hub (rev 07)
-    00:02.0 VGA compatible controller: Intel Corporation Mobile 4 Series Chipset Integrated Graphics Controller (rev 07)
-    00:02.1 Display controller: Intel Corporation Mobile 4 Series Chipset Integrated Graphics Controller (rev 07)
-    00:03.0 Communication controller: Intel Corporation Mobile 4 Series Chipset MEI Controller (rev 07)
-    00:03.2 IDE interface: Intel Corporation Mobile 4 Series Chipset PT IDER Controller (rev 07)
-    00:03.3 Serial controller: Intel Corporation Mobile 4 Series Chipset AMT SOL Redirection (rev 07)
-    00:19.0 Ethernet controller: Intel Corporation 82567LM Gigabit Network Connection (rev 03)
-    00:1a.0 USB Controller: Intel Corporation 82801I (ICH9 Family) USB UHCI Controller #4 (rev 03)
-    00:1a.1 USB Controller: Intel Corporation 82801I (ICH9 Family) USB UHCI Controller #5 (rev 03)
-    00:1a.2 USB Controller: Intel Corporation 82801I (ICH9 Family) USB UHCI Controller #6 (rev 03)
-    00:1a.7 USB Controller: Intel Corporation 82801I (ICH9 Family) USB2 EHCI Controller #2 (rev 03)
-    00:1b.0 Audio device: Intel Corporation 82801I (ICH9 Family) HD Audio Controller (rev 03)
-    00:1c.0 PCI bridge: Intel Corporation 82801I (ICH9 Family) PCI Express Port 1 (rev 03)
-    00:1c.1 PCI bridge: Intel Corporation 82801I (ICH9 Family) PCI Express Port 2 (rev 03)
-    00:1c.3 PCI bridge: Intel Corporation 82801I (ICH9 Family) PCI Express Port 4 (rev 03)
-    00:1d.0 USB Controller: Intel Corporation 82801I (ICH9 Family) USB UHCI Controller #1 (rev 03)
-    00:1d.1 USB Controller: Intel Corporation 82801I (ICH9 Family) USB UHCI Controller #2 (rev 03)
-    00:1d.2 USB Controller: Intel Corporation 82801I (ICH9 Family) USB UHCI Controller #3 (rev 03)
-    00:1d.7 USB Controller: Intel Corporation 82801I (ICH9 Family) USB2 EHCI Controller #1 (rev 03)
-    00:1e.0 PCI bridge: Intel Corporation 82801 Mobile PCI Bridge (rev 93)
-    00:1f.0 ISA bridge: Intel Corporation ICH9M-E LPC Interface Controller (rev 03)
-    00:1f.2 SATA controller: Intel Corporation ICH9M/M-E SATA AHCI Controller (rev 03)
-    00:1f.3 SMBus: Intel Corporation 82801I (ICH9 Family) SMBus Controller (rev 03)
-    03:00.0 Network controller: Intel Corporation Wireless WiFi Link 5300
-
-
-## pm-suspend
-Will suspend once, then subsequent suspends fail with: 
-
-    legacy_suspend(): pnp_bus_suspend+0x0/0x6a returns 28
-    PM: Device 00:0a failed to suspend: error 28
-

diff --git a/fedora/2011pmtestday.mdwn b/fedora/2011pmtestday.mdwn
index 93dc38c..1c96668 100644
--- a/fedora/2011pmtestday.mdwn
+++ b/fedora/2011pmtestday.mdwn
@@ -1,5 +1,33 @@
 # PM Test Day Results!
 
+## lspci output
+
+    00:00.0 Host bridge: Intel Corporation Mobile 4 Series Chipset Memory Controller Hub (rev 07)
+    00:02.0 VGA compatible controller: Intel Corporation Mobile 4 Series Chipset Integrated Graphics Controller (rev 07)
+    00:02.1 Display controller: Intel Corporation Mobile 4 Series Chipset Integrated Graphics Controller (rev 07)
+    00:03.0 Communication controller: Intel Corporation Mobile 4 Series Chipset MEI Controller (rev 07)
+    00:03.2 IDE interface: Intel Corporation Mobile 4 Series Chipset PT IDER Controller (rev 07)
+    00:03.3 Serial controller: Intel Corporation Mobile 4 Series Chipset AMT SOL Redirection (rev 07)
+    00:19.0 Ethernet controller: Intel Corporation 82567LM Gigabit Network Connection (rev 03)
+    00:1a.0 USB Controller: Intel Corporation 82801I (ICH9 Family) USB UHCI Controller #4 (rev 03)
+    00:1a.1 USB Controller: Intel Corporation 82801I (ICH9 Family) USB UHCI Controller #5 (rev 03)
+    00:1a.2 USB Controller: Intel Corporation 82801I (ICH9 Family) USB UHCI Controller #6 (rev 03)
+    00:1a.7 USB Controller: Intel Corporation 82801I (ICH9 Family) USB2 EHCI Controller #2 (rev 03)
+    00:1b.0 Audio device: Intel Corporation 82801I (ICH9 Family) HD Audio Controller (rev 03)
+    00:1c.0 PCI bridge: Intel Corporation 82801I (ICH9 Family) PCI Express Port 1 (rev 03)
+    00:1c.1 PCI bridge: Intel Corporation 82801I (ICH9 Family) PCI Express Port 2 (rev 03)
+    00:1c.3 PCI bridge: Intel Corporation 82801I (ICH9 Family) PCI Express Port 4 (rev 03)
+    00:1d.0 USB Controller: Intel Corporation 82801I (ICH9 Family) USB UHCI Controller #1 (rev 03)
+    00:1d.1 USB Controller: Intel Corporation 82801I (ICH9 Family) USB UHCI Controller #2 (rev 03)
+    00:1d.2 USB Controller: Intel Corporation 82801I (ICH9 Family) USB UHCI Controller #3 (rev 03)
+    00:1d.7 USB Controller: Intel Corporation 82801I (ICH9 Family) USB2 EHCI Controller #1 (rev 03)
+    00:1e.0 PCI bridge: Intel Corporation 82801 Mobile PCI Bridge (rev 93)
+    00:1f.0 ISA bridge: Intel Corporation ICH9M-E LPC Interface Controller (rev 03)
+    00:1f.2 SATA controller: Intel Corporation ICH9M/M-E SATA AHCI Controller (rev 03)
+    00:1f.3 SMBus: Intel Corporation 82801I (ICH9 Family) SMBus Controller (rev 03)
+    03:00.0 Network controller: Intel Corporation Wireless WiFi Link 5300
+
+
 ## pm-suspend
 Will suspend once, then subsequent suspends fail with: 
 

diff --git a/fedora/2011pmtestday.mdwn b/fedora/2011pmtestday.mdwn
index 2660c81..93dc38c 100644
--- a/fedora/2011pmtestday.mdwn
+++ b/fedora/2011pmtestday.mdwn
@@ -2,6 +2,7 @@
 
 ## pm-suspend
 Will suspend once, then subsequent suspends fail with: 
-legacy_suspend(): pnp_bus_suspend+0x0/0x6a returns 28
-PM: Device 00:0a failed to suspend: error 28
+
+    legacy_suspend(): pnp_bus_suspend+0x0/0x6a returns 28
+    PM: Device 00:0a failed to suspend: error 28
 

diff --git a/fedora/2011pmtestday.mdwn b/fedora/2011pmtestday.mdwn
new file mode 100644
index 0000000..2660c81
--- /dev/null
+++ b/fedora/2011pmtestday.mdwn
@@ -0,0 +1,7 @@
+# PM Test Day Results!
+
+## pm-suspend
+Will suspend once, then subsequent suspends fail with: 
+legacy_suspend(): pnp_bus_suspend+0x0/0x6a returns 28
+PM: Device 00:0a failed to suspend: error 28
+

diff --git a/runiq/yaml/samples.mdwn b/runiq/yaml/samples.mdwn
index 1529128..2dc8701 100644
--- a/runiq/yaml/samples.mdwn
+++ b/runiq/yaml/samples.mdwn
@@ -6,8 +6,8 @@ Some samples for YAML Markup
     name: dash
     version: 0.5.4
     main_urls:
-     - http://gondor.apana.org.au/~herbert/dash/files/$source
-    main_hash: sha512:6aefc23f8c09c536d9d6a22f1f7b79cc118c80eaa61dc8bfcbb57249bd845b6194eba65fcb24673cb9f248c9e9dc90835621e5a8c70aeb2fcb2de5a1e8a23a5f
+     - http://gondor.apana.org.au/~herbert/dash/files/${main_source}
+    main_verification: sha512:6aefc23f8c09c536d9d6a22f1f7b79cc118c80eaa61dc8bfcbb57249bd845b6194eba65fcb24673cb9f248c9e9dc90835621e5a8c70aeb2fcb2de5a1e8a23a5f
     license: BSD
     entered: 20060706
     short: Minimal POSIX Compliant shell
@@ -19,3 +19,29 @@ Some samples for YAML Markup
 The name of the source is arbitrary. Follows the convention $[var]\_source. This allows for referencing multiple sources in the configs and spell building logic.
 You then extend the options with main_url and main_hash to enable downloading and verification of the source.
 In main_url, the $source will be replaced with $main_source. $main_source will be generated by the system if not present. The possible permutations of $main_source should be configurable and should include: $name-$version and $name_$version. $name and $version are scoped within the level they're at. In this spell it's the default level as there are no others. The system will try multiple values .tar.bz2, .tar.gz, .zip, etc. until the list is exhausted. This list should be configurable. Upon finding the right version, it should set the $main_source variable in the config so that the testing doesn't have to happen again.
+
+## Simple multiple files spell
+
+		name: simple2
+		version: 1.2.3
+		main_source: ${name}-stable-${version}.tar.gz
+		main_urls:
+		 - http://www.example.com/foo/bar/${main_source}
+		 - http://www.example.net/foo/bar/${main_source}
+		main_verification: sha512:111122223333455645645adfeetc
+		secondary_source: ${name}-stable-${version}.tar.gz.sig
+		secondary_urls:
+		 - http://www.example.com/foo/bar/${secondary_source}
+		 - http://www.foobar.com/foo/bar/${seconday_source}
+		secondary_verification: gpg:${secondary_source}
+		entered: 20110101
+		short: This is a description of my spell
+		description: |
+		  Look at me typing something that's at least two lines of text.
+			Wow, this is really quite fascinating
+
+This example shows how you could specify the configuration for a spell that would have to download the verification signature for it's spell file
+
+
+## Spell with configuration
+

diff --git a/maven/buildhelperplugin.mdwn b/maven/buildhelperplugin.mdwn
index b8394c6..0b721ff 100644
--- a/maven/buildhelperplugin.mdwn
+++ b/maven/buildhelperplugin.mdwn
@@ -31,3 +31,6 @@ http://mojo.codehaus.org/build-helper-maven-plugin/
         </plugins>
       </build>
     </project>
+
+
+[[!taglink maven]]

diff --git a/maven/buildhelperplugin.mdwn b/maven/buildhelperplugin.mdwn
new file mode 100644
index 0000000..b8394c6
--- /dev/null
+++ b/maven/buildhelperplugin.mdwn
@@ -0,0 +1,33 @@
+# Adding build paths to the IDE
+
+This allows you to add build paths to the IDE, helps with code completion and such
+
+http://mojo.codehaus.org/build-helper-maven-plugin/
+
+    <project>
+      ...
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>build-helper-maven-plugin</artifactId>
+            <version>1.5</version>
+            <executions>
+              <execution>
+                <id>add-source</id>
+                <phase>generate-sources</phase>
+                <goals>
+                  <goal>add-source</goal>
+                </goals>
+                <configuration>
+                  <sources>
+                    <source>some directory</source>
+                    ...
+                  </sources>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </project>

diff --git a/maven/POMSamples.mdwn b/maven/POMSamples.mdwn
index 00cf402..c71dc4b 100644
--- a/maven/POMSamples.mdwn
+++ b/maven/POMSamples.mdwn
@@ -19,6 +19,7 @@ This is how you specify how to allow the `mvn deploy` command to upload snapshot
 
 ##Automatically building with an assembly
 This attaches the maven assembly plugin to the build process. It also specifies which version of the plugin to use in the pluginManagement section.
+
 	<build>
 			<plugins>
 					<plugin> <!-- the assembly plugin goes here! -->

diff --git a/runiq/yaml/samples.mdwn b/runiq/yaml/samples.mdwn
new file mode 100644
index 0000000..1529128
--- /dev/null
+++ b/runiq/yaml/samples.mdwn
@@ -0,0 +1,21 @@
+# Samples
+Some samples for YAML Markup
+
+## Simplest spell possible
+
+    name: dash
+    version: 0.5.4
+    main_urls:
+     - http://gondor.apana.org.au/~herbert/dash/files/$source
+    main_hash: sha512:6aefc23f8c09c536d9d6a22f1f7b79cc118c80eaa61dc8bfcbb57249bd845b6194eba65fcb24673cb9f248c9e9dc90835621e5a8c70aeb2fcb2de5a1e8a23a5f
+    license: BSD
+    entered: 20060706
+    short: Minimal POSIX Compliant shell
+    description: |
+      DASH is a POSIX-compliant implementation of /bin/sh that aims to be as small as
+      possible. It does this without sacrificing speed where possible. In fact, it is
+      significantly faster than bash (the GNU Bourne-Again SHell) for most tasks.
+
+The name of the source is arbitrary. Follows the convention $[var]\_source. This allows for referencing multiple sources in the configs and spell building logic.
+You then extend the options with main_url and main_hash to enable downloading and verification of the source.
+In main_url, the $source will be replaced with $main_source. $main_source will be generated by the system if not present. The possible permutations of $main_source should be configurable and should include: $name-$version and $name_$version. $name and $version are scoped within the level they're at. In this spell it's the default level as there are no others. The system will try multiple values .tar.bz2, .tar.gz, .zip, etc. until the list is exhausted. This list should be configurable. Upon finding the right version, it should set the $main_source variable in the config so that the testing doesn't have to happen again.

diff --git a/runiq/yaml/format.creole b/runiq/yaml/format.creole
index 6b73727..c994614 100644
--- a/runiq/yaml/format.creole
+++ b/runiq/yaml/format.creole
@@ -2,5 +2,5 @@
 
 Hoping this will be a DTD of sorts describing all the various bits of a YAML Metadata file.
 
----
+
 [[!tag Runiq]]

diff --git a/runiq/yaml/format.creole b/runiq/yaml/format.creole
index 9afce2d..6b73727 100644
--- a/runiq/yaml/format.creole
+++ b/runiq/yaml/format.creole
@@ -2,3 +2,5 @@
 
 Hoping this will be a DTD of sorts describing all the various bits of a YAML Metadata file.
 
+---
+[[!tag Runiq]]

diff --git a/runiq/features.creole b/runiq/features.creole
index 66a8d7a..e9ccb23 100644
--- a/runiq/features.creole
+++ b/runiq/features.creole
@@ -34,3 +34,6 @@ Not in any particular order, or guarantee for release or anything, just transfer
 ** GUI
 ** CLI
 ** Web Interface?
+
+---
+[[!tag Runiq]]

diff --git a/runiq.mdwn b/runiq.mdwn
index 24b1af5..abe503e 100644
--- a/runiq.mdwn
+++ b/runiq.mdwn
@@ -12,3 +12,6 @@ So now I need to create sample spells using the YAML to be sure I've got a struc
 
 ## Features
 [[Runiq/Features]]
+
+---
+[[!taglink Runiq]]

diff --git a/runiq.mdwn b/runiq.mdwn
index 78dbdcd..24b1af5 100644
--- a/runiq.mdwn
+++ b/runiq.mdwn
@@ -9,3 +9,6 @@ I have opted to go with the YAML markup language to define spell structures. I c
 So now I need to create sample spells using the YAML to be sure I've got a structure down that can actually be used.
 
 [[!map pages="Runiq/YAML/* and !*/Discussion" ]]
+
+## Features
+[[Runiq/Features]]

diff --git a/runiq/features.creole b/runiq/features.creole
new file mode 100644
index 0000000..66a8d7a
--- /dev/null
+++ b/runiq/features.creole
@@ -0,0 +1,36 @@
+=Features desired in Runiq
+Not in any particular order, or guarantee for release or anything, just transferring from my notebook to the interblags.
+
+* Multi-version spells
+** Stable, devel, scm, anything
+* Sub-depends
+** (optionally) needs: blah with bar
+* non-optional dependencies
+** needs: blah, foo, bar
+* optional dependencies
+** when including package "bla" also do --with-bla (optionally configurable)
+* configuration options
+** --with-foo
+* afterbuild triggers
+** Logic that's run upon completion of the necessary triggers.
+*** Example: Java plugin and firefox. Order doesn't matter, just be sure that when both are installed, the plugin gets installed.
+* build scripts
+** ruby and bash? (or just bash?)
+* Declarative config
+** no logic in the metadata
+* pure ruby downloading
+** As much as possible
+* threaded downloading
+** Configurable download concurrency
+* threaded building
+** Support building multiple make jobs
+** Support building more than one spell at the same time
+*** Synchronizing dependencies?
+* staging
+** Castfs?
+** Ramdisk for staging?
+* Upload of successful build configurations to some sort of (anonymous?) statistics collector
+* support for multiple frontends to configure spells
+** GUI
+** CLI
+** Web Interface?

diff --git a/runiq/yaml/format.creole b/runiq/yaml/format.creole
new file mode 100644
index 0000000..9afce2d
--- /dev/null
+++ b/runiq/yaml/format.creole
@@ -0,0 +1,4 @@
+=YAML Format markup
+
+Hoping this will be a DTD of sorts describing all the various bits of a YAML Metadata file.
+

diff --git a/runiq.mdwn b/runiq.mdwn
new file mode 100644
index 0000000..78dbdcd
--- /dev/null
+++ b/runiq.mdwn
@@ -0,0 +1,11 @@
+# Runiq
+A linux distribution built similar to SMGL but built in ruby as much as possible and using a more structured approach to package metadata.
+
+## Why?
+I'm disappointed in the abilities of SourceMage currently. It's grown stagnant and none of the developers are currently terribly motivated to do anything about it. I believe some of this stems from the menial work that is required to test, update, and verify spells. I want a more structured, and yet easy to modify (for both computers and people) metadata associated with spells. One that computers can read and determine the multiple branches. One that provides feature parity with SourceMage (eventually.)
+
+## YAML Spell Structure
+I have opted to go with the YAML markup language to define spell structures. I can define datastructures easily and it's trivial for machines to read them and people to create them as well.
+So now I need to create sample spells using the YAML to be sure I've got a structure down that can actually be used.
+
+[[!map pages="Runiq/YAML/* and !*/Discussion" ]]

diff --git a/index.mdwn b/index.mdwn
index 5876637..33a4759 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -6,6 +6,8 @@ ikiwiki is the awesome
 
 [[SourceMage]] Projects!
 
+[[Runiq]] Some thoughts on yet another package management system.
+
 [[Puppet]] I'm learning puppet!
 
 [[maven]] notes and such

diff --git a/vnstat.mdwn b/vnstat.mdwn
index 63cbdb0..9019a5b 100644
--- a/vnstat.mdwn
+++ b/vnstat.mdwn
@@ -7,11 +7,11 @@ Using my SourceMage router, so that I can easily customize the installation.
 * Monitor multiple interfaces
 * generate images
 * submit images to a different location
-* 
 
 ## TODO List
 
 * build init script
+  * run as non-root user
 * set up configuration file
 * figure out how to monitor multiple interfaces
 

diff --git a/vnstat.mdwn b/vnstat.mdwn
new file mode 100644
index 0000000..63cbdb0
--- /dev/null
+++ b/vnstat.mdwn
@@ -0,0 +1,19 @@
+# Setting up Vnstat
+
+Using my SourceMage router, so that I can easily customize the installation.
+
+## Desired features
+
+* Monitor multiple interfaces
+* generate images
+* submit images to a different location
+* 
+
+## TODO List
+
+* build init script
+* set up configuration file
+* figure out how to monitor multiple interfaces
+
+---
+[[!taglink SourceMage]]

diff --git a/index.mdwn b/index.mdwn
index 2db1388..5876637 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -8,6 +8,8 @@ ikiwiki is the awesome
 
 [[Puppet]] I'm learning puppet!
 
+[[maven]] notes and such
+
 Old wiki pages:
 
 * [[CopyFilesOverNetwork]]

diff --git a/maven/sesamedependency.mdwn b/maven/sesamedependency.mdwn
new file mode 100644
index 0000000..132b82b
--- /dev/null
+++ b/maven/sesamedependency.mdwn
@@ -0,0 +1,18 @@
+# Building a complex dependency, when all you get is a POM file
+
+From <http://maven.40175.n5.nabble.com/Resolving-dependencies-of-type-pom-td2644682.html> you specify the dependency as:
+    
+    <type>pom</type>
+
+This will import the pom and it's necessary dependencies into your pom's project. This allows projects to specify complex dependencies from their project's pom file.
+
+For example the sesame dependency is:
+
+    <dependency>
+        <groupId>org.openrdf.sesame</groupId>
+        <artifactId>sesame-runtime</artifactId>
+        <version>2.3.2</version>
+        <type>pom</type>
+    </dependency>
+
+This will import the appropriate dependencies as configured within the pom file.

diff --git a/puppet.mdwn b/puppet.mdwn
index f265b42..f8bdb0f 100644
--- a/puppet.mdwn
+++ b/puppet.mdwn
@@ -4,3 +4,11 @@ I'm slowly learning puppet and as I configure my systems I remember things that
 # Packages
 * tar
 * openssh-server
+
+
+# Configurations
+LDAP configuration - need to have the clients configured to be able to get the user configuration stuff over TLS secured ldap. This will include client certificates also.
+
+Cacti configuration - set up a Cacti user and the necessary ssh-key and its authorized hosts configuration. Limit it to the host that Cacti connects from.
+
+Ssmtp configuration - eventually there will be a relay mail host. I want the Ssmtp configuration to be universal so that I will not need to run postfix on all boxes. For fedora it will require switching the mail provider to be Ssmtp instead of postfix via system-switch-mail.

diff --git a/index.mdwn b/index.mdwn
index ed5c816..2db1388 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -6,6 +6,8 @@ ikiwiki is the awesome
 
 [[SourceMage]] Projects!
 
+[[Puppet]] I'm learning puppet!
+
 Old wiki pages:
 
 * [[CopyFilesOverNetwork]]

diff --git a/puppet.mdwn b/puppet.mdwn
new file mode 100644
index 0000000..f265b42
--- /dev/null
+++ b/puppet.mdwn
@@ -0,0 +1,6 @@
+# Purpose
+I'm slowly learning puppet and as I configure my systems I remember things that I need to include on them. Here I'm going to make notes so that I don't forget what things I need to put onto the systems. Making notes for the puppet configuration I desire
+
+# Packages
+* tar
+* openssh-server

diff --git a/SourceMage/MoinUpgrade-1.9.mdwn b/SourceMage/MoinUpgrade-1.9.mdwn
new file mode 100755
index 0000000..db4f29e
--- /dev/null
+++ b/SourceMage/MoinUpgrade-1.9.mdwn
@@ -0,0 +1,26 @@
+#Upgrade moinmoin on wiki.sourcemage.org
+
+## remote instructions
+http://moinmo.in/RickVanderveer/UpgradingFromMoin18ToMoin19
+They're not the greatest, but they'll work
+
+## scribbling stuff
+Scribble moinmoin, xapian-core, xapian-bindings, mod_wsgi to local from test, so we're up to date.
+
+###data migration
+    moin --config-dir=/usr/share/moin/sourcemage/ --wiki-url=http://wiki.sourcemage.org/ migration data
+
+Then clean the cache
+
+    moin --config-dir=/usr/share/moin/sourcemage/ --wiki-url=http://wiki.sourcemage.org/ maint cleancache
+
+As long as the above things are done in the right order, and with the right order, there's no hiccups. Oh and make sure permissions are accurate
+
+## SUHCURITY
+http://moinmo.in/SecurityFixes
+
+We should be good from this standpoint
+
+
+[[!taglink SourceMage]]
+

diff --git a/SourceMage/BugzillaUpgrade.creole b/SourceMage/BugzillaUpgrade.creole
deleted file mode 100755
index f8e1ede..0000000
--- a/SourceMage/BugzillaUpgrade.creole
+++ /dev/null
@@ -1,32 +0,0 @@
-== Upgrading our really old ass bugzilla to the latest: 3.0.4
-
-=== Dependencies
-Oh my God. It's full of perl modules....
-
-=== Database
-Many thanks go to `mkanat` on [[irc://irc.mozilla.org/mozwebtools]] for helping me figure this stuff out
-
-Prune the database from fawkes to only include these tables, somehow some junk got into our database :|
-
-Schemas:
-* latest version:
-** [[http://www.ravenbrook.com/project/p4dti/tool/cgi/bugzilla-schema/index.cgi?action=single&version=3.0.4&view=View+schema]]
-* Our version:
-** [[http://www.ravenbrook.com/project/p4dti/tool/cgi/bugzilla-schema/index.cgi?action=single&version=2.18.6&view=View+schema]]
-
-Somehow there's lots of bogus tables there. Not sure why...
-
-Actual code to delete them all:
-
-{{{
-DROP TABLE `developers`, `documents`, `functions`, `gl_access`, `gl_article_images`, `gl_blocks`, `gl_commentcodes`, `gl_commentmodes`, `gl_comments`, `gl_commentspeedlimit`, `gl_cookiecodes`, `gl_dateformats`, `gl_events`, `gl_eventsubmission`, `gl_featurecodes`, `gl_features`, `gl_frontpagecodes`, `gl_groups`, `gl_group_assignments`, `gl_links`, `gl_linksubmission`, `gl_maillist`, `gl_personal_events`, `gl_plugins`, `gl_pollanswers`, `gl_pollquestions`, `gl_pollvoters`, `gl_postmodes`, `gl_sessions`, `gl_sortcodes`, `gl_statuscodes`, `gl_stories`, `gl_storysubmission`, `gl_submitspeedlimit`, `gl_topics`, `gl_tzcodes`, `gl_usercomment`, `gl_userindex`, `gl_userinfo`, `gl_userprefs`, `gl_users`, `gl_vars`, `messu_messages`, `permissions`, `phpbb_auth_access`, `phpbb_banlist`, `phpbb_categories`, `phpbb_config`, `phpbb_disallow`, `phpbb_forums`, `phpbb_forum_prune`, `phpbb_groups`, `phpbb_posts`, `phpbb_posts_text`, `phpbb_privmsgs`, `phpbb_privmsgs_text`, `phpbb_ranks`, `phpbb_search_results`, `phpbb_search_wordmatch`, `phpbb_smilies`, `phpbb_themes`, `phpbb_themes_name`, `phpbb_topics`, `phpbb_topics_watch`, `phpbb_users`, `phpbb_user_group`, `phpbb_vote_desc`, `phpbb_vote_results`, `phpbb_vote_voters`, `phpbb_words`, `project_comments`, `project_issues`, `project_projects`, `project_releases`, `project_subscriptions`, `staticpage`, `users_grouppermissions`, `users_groups`, `users_objectpermissions`, `users_permissions`, `users_usergroups`, `users_users`, `wiki_interwiki`, `wiki_links`, `wiki_pages`, `wiki_rate`, `wiki_remote_pages`, `wiki_sisterwiki`;
-}}}
-
-=== Upgrade path
-Follow the standard bugzilla instructions. http://www.bugzilla.org/releases/3.0.4/release-notes.html#v30_upgrading
- Also, cast encode-detect and run {{{contrib/recode.pl}}} it will go through and update everything to utf8. It needs to be done. {{{./checksetup.pl}}} will warn you about it, but I'm making the note here if you need to do it.
-
-=== Afterwards
-Run  {{{/usr/share/bugzilla/./collectstats.pl --regenerate}}} That will regenerate things for the old reports.cgi. Takes a long damn time. At least on my vm. OMG, it's taking all day! I don't really want to kill it at 93.9%, but I think I'm going to.
-
-[[!taglink SourceMage]]
diff --git a/SourceMage/BugzillaUpgrade.mdwn b/SourceMage/BugzillaUpgrade.mdwn
new file mode 100644
index 0000000..a25ca0e
--- /dev/null
+++ b/SourceMage/BugzillaUpgrade.mdwn
@@ -0,0 +1,30 @@
+# Upgrading our really old ass bugzilla to the latest: 3.0.4
+
+##Dependencies
+Oh my God. It's full of perl modules....
+
+##Database
+Many thanks go to `mkanat` on irc://irc.mozilla.org/mozwebtools for helping me figure this stuff out
+
+Prune the database from fawkes to only include these tables, somehow some junk got into our database :|
+
+Schemas:
+* latest version:
+ * http://www.ravenbrook.com/project/p4dti/tool/cgi/bugzilla-schema/index.cgi?action=single&version=3.0.4&view=View+schema
+* Our version:
+ * http://www.ravenbrook.com/project/p4dti/tool/cgi/bugzilla-schema/index.cgi?action=single&version=2.18.6&view=View+schema
+
+Somehow there's lots of bogus tables there. Not sure why...
+
+Actual code to delete them all:
+
+```DROP TABLE `developers`, `documents`, `functions`, `gl_access`, `gl_article_images`, `gl_blocks`, `gl_commentcodes`, `gl_commentmodes`, `gl_comments`, `gl_commentspeedlimit`, `gl_cookiecodes`, `gl_dateformats`, `gl_events`, `gl_eventsubmission`, `gl_featurecodes`, `gl_features`, `gl_frontpagecodes`, `gl_groups`, `gl_group_assignments`, `gl_links`, `gl_linksubmission`, `gl_maillist`, `gl_personal_events`, `gl_plugins`, `gl_pollanswers`, `gl_pollquestions`, `gl_pollvoters`, `gl_postmodes`, `gl_sessions`, `gl_sortcodes`, `gl_statuscodes`, `gl_stories`, `gl_storysubmission`, `gl_submitspeedlimit`, `gl_topics`, `gl_tzcodes`, `gl_usercomment`, `gl_userindex`, `gl_userinfo`, `gl_userprefs`, `gl_users`, `gl_vars`, `messu_messages`, `permissions`, `phpbb_auth_access`, `phpbb_banlist`, `phpbb_categories`, `phpbb_config`, `phpbb_disallow`, `phpbb_forums`, `phpbb_forum_prune`, `phpbb_groups`, `phpbb_posts`, `phpbb_posts_text`, `phpbb_privmsgs`, `phpbb_privmsgs_text`, `phpbb_ranks`, `phpbb_search_results`, `phpbb_search_wordmatch`, `phpbb_smilies`, `phpbb_themes`, `phpbb_themes_name`, `phpbb_topics`, `phpbb_topics_watch`, `phpbb_users`, `phpbb_user_group`, `phpbb_vote_desc`, `phpbb_vote_results`, `phpbb_vote_voters`, `phpbb_words`, `project_comments`, `project_issues`, `project_projects`, `project_releases`, `project_subscriptions`, `staticpage`, `users_grouppermissions`, `users_groups`, `users_objectpermissions`, `users_permissions`, `users_usergroups`, `users_users`, `wiki_interwiki`, `wiki_links`, `wiki_pages`, `wiki_rate`, `wiki_remote_pages`, `wiki_sisterwiki`;```
+
+##Upgrade path
+Follow the standard bugzilla instructions. http://www.bugzilla.org/releases/3.0.4/release-notes.html#v30_upgrading
+ Also, cast encode-detect and run `contrib/recode.pl` it will go through and update everything to utf8. It needs to be done. `./checksetup.pl` will warn you about it, but I'm making the note here if you need to do it.
+
+##Afterwards
+Run  ` /usr/share/bugzilla/./collectstats.pl --regenerate ` That will regenerate things for the old reports.cgi. Takes a long damn time. At least on my vm. OMG, it's taking all day! I don't really want to kill it at 93.9%, but I think I'm going to.
+
+[[!taglink SourceMage]]

diff --git a/SourceMage/BugzillaUpgrade.creole b/SourceMage/BugzillaUpgrade.creole
index 0486b22..f8e1ede 100755
--- a/SourceMage/BugzillaUpgrade.creole
+++ b/SourceMage/BugzillaUpgrade.creole
@@ -4,15 +4,15 @@
 Oh my God. It's full of perl modules....
 
 === Database
-Many thanks go to `mkanat` on [[irc://irc.mozilla.org/mozwebtools|mozwebtools on irc]] for helping me figure this stuff out
+Many thanks go to `mkanat` on [[irc://irc.mozilla.org/mozwebtools]] for helping me figure this stuff out
 
 Prune the database from fawkes to only include these tables, somehow some junk got into our database :|
 
 Schemas:
 * latest version:
-** [[http://www.ravenbrook.com/project/p4dti/tool/cgi/bugzilla-schema/index.cgi?action=single&version=3.0.4&view=View+schema|Schema for 3.0.4]]
+** [[http://www.ravenbrook.com/project/p4dti/tool/cgi/bugzilla-schema/index.cgi?action=single&version=3.0.4&view=View+schema]]
 * Our version:
-** [[http://www.ravenbrook.com/project/p4dti/tool/cgi/bugzilla-schema/index.cgi?action=single&version=2.18.6&view=View+schema|Schema for 2.18.6]]
+** [[http://www.ravenbrook.com/project/p4dti/tool/cgi/bugzilla-schema/index.cgi?action=single&version=2.18.6&view=View+schema]]
 
 Somehow there's lots of bogus tables there. Not sure why...
 

diff --git a/SourceMage/BugzillaUpgrade.creole b/SourceMage/BugzillaUpgrade.creole
index 409c0b0..0486b22 100755
--- a/SourceMage/BugzillaUpgrade.creole
+++ b/SourceMage/BugzillaUpgrade.creole
@@ -4,15 +4,15 @@
 Oh my God. It's full of perl modules....
 
 === Database
-Many thanks go to `mkanat` on [[mozwebtools on irc|irc://irc.mozilla.org/mozwebtools]] for helping me figure this stuff out
+Many thanks go to `mkanat` on [[irc://irc.mozilla.org/mozwebtools|mozwebtools on irc]] for helping me figure this stuff out
 
 Prune the database from fawkes to only include these tables, somehow some junk got into our database :|
 
 Schemas:
 * latest version:
-** [[Schema for 3.0.4|http://www.ravenbrook.com/project/p4dti/tool/cgi/bugzilla-schema/index.cgi?action=single&version=3.0.4&view=View+schema]]
+** [[http://www.ravenbrook.com/project/p4dti/tool/cgi/bugzilla-schema/index.cgi?action=single&version=3.0.4&view=View+schema|Schema for 3.0.4]]
 * Our version:
-** [[Schema for 2.18.6|http://www.ravenbrook.com/project/p4dti/tool/cgi/bugzilla-schema/index.cgi?action=single&version=2.18.6&view=View+schema]]
+** [[http://www.ravenbrook.com/project/p4dti/tool/cgi/bugzilla-schema/index.cgi?action=single&version=2.18.6&view=View+schema|Schema for 2.18.6]]
 
 Somehow there's lots of bogus tables there. Not sure why...
 
@@ -23,7 +23,7 @@ DROP TABLE `developers`, `documents`, `functions`, `gl_access`, `gl_article_imag
 }}}
 
 === Upgrade path
-Follow the standard bugzilla instructions. [[Upgrading|http://www.bugzilla.org/releases/3.0.4/release-notes.html#v30_upgrading]]
+Follow the standard bugzilla instructions. http://www.bugzilla.org/releases/3.0.4/release-notes.html#v30_upgrading
  Also, cast encode-detect and run {{{contrib/recode.pl}}} it will go through and update everything to utf8. It needs to be done. {{{./checksetup.pl}}} will warn you about it, but I'm making the note here if you need to do it.
 
 === Afterwards

diff --git a/SourceMage/BugzillaUpgrade.creole b/SourceMage/BugzillaUpgrade.creole
index ffd0786..409c0b0 100755
--- a/SourceMage/BugzillaUpgrade.creole
+++ b/SourceMage/BugzillaUpgrade.creole
@@ -4,15 +4,15 @@
 Oh my God. It's full of perl modules....
 
 === Database
-Many thanks go to `mkanat` on [mozwebtools on irc](irc://irc.mozilla.org/mozwebtools) for helping me figure this stuff out
+Many thanks go to `mkanat` on [[mozwebtools on irc|irc://irc.mozilla.org/mozwebtools]] for helping me figure this stuff out
 
 Prune the database from fawkes to only include these tables, somehow some junk got into our database :|
 
 Schemas:
 * latest version:
-** [Schema for 3.0.4](http://www.ravenbrook.com/project/p4dti/tool/cgi/bugzilla-schema/index.cgi?action=single&version=3.0.4&view=View+schema)
+** [[Schema for 3.0.4|http://www.ravenbrook.com/project/p4dti/tool/cgi/bugzilla-schema/index.cgi?action=single&version=3.0.4&view=View+schema]]
 * Our version:
-** [Schema for 2.18.6](http://www.ravenbrook.com/project/p4dti/tool/cgi/bugzilla-schema/index.cgi?action=single&version=2.18.6&view=View+schema)
+** [[Schema for 2.18.6|http://www.ravenbrook.com/project/p4dti/tool/cgi/bugzilla-schema/index.cgi?action=single&version=2.18.6&view=View+schema]]
 
 Somehow there's lots of bogus tables there. Not sure why...
 

diff --git a/SourceMage/BugzillaUpgrade.creole b/SourceMage/BugzillaUpgrade.creole
index 409c0b0..ffd0786 100755
--- a/SourceMage/BugzillaUpgrade.creole
+++ b/SourceMage/BugzillaUpgrade.creole
@@ -4,15 +4,15 @@
 Oh my God. It's full of perl modules....
 
 === Database
-Many thanks go to `mkanat` on [[mozwebtools on irc|irc://irc.mozilla.org/mozwebtools]] for helping me figure this stuff out
+Many thanks go to `mkanat` on [mozwebtools on irc](irc://irc.mozilla.org/mozwebtools) for helping me figure this stuff out
 
 Prune the database from fawkes to only include these tables, somehow some junk got into our database :|
 
 Schemas:
 * latest version:
-** [[Schema for 3.0.4|http://www.ravenbrook.com/project/p4dti/tool/cgi/bugzilla-schema/index.cgi?action=single&version=3.0.4&view=View+schema]]
+** [Schema for 3.0.4](http://www.ravenbrook.com/project/p4dti/tool/cgi/bugzilla-schema/index.cgi?action=single&version=3.0.4&view=View+schema)
 * Our version:
-** [[Schema for 2.18.6|http://www.ravenbrook.com/project/p4dti/tool/cgi/bugzilla-schema/index.cgi?action=single&version=2.18.6&view=View+schema]]
+** [Schema for 2.18.6](http://www.ravenbrook.com/project/p4dti/tool/cgi/bugzilla-schema/index.cgi?action=single&version=2.18.6&view=View+schema)
 
 Somehow there's lots of bogus tables there. Not sure why...
 

diff --git a/SourceMage/BugzillaUpgrade.creole b/SourceMage/BugzillaUpgrade.creole
index 0486b22..409c0b0 100755
--- a/SourceMage/BugzillaUpgrade.creole
+++ b/SourceMage/BugzillaUpgrade.creole
@@ -4,15 +4,15 @@
 Oh my God. It's full of perl modules....
 
 === Database
-Many thanks go to `mkanat` on [[irc://irc.mozilla.org/mozwebtools|mozwebtools on irc]] for helping me figure this stuff out
+Many thanks go to `mkanat` on [[mozwebtools on irc|irc://irc.mozilla.org/mozwebtools]] for helping me figure this stuff out
 
 Prune the database from fawkes to only include these tables, somehow some junk got into our database :|
 
 Schemas:
 * latest version:
-** [[http://www.ravenbrook.com/project/p4dti/tool/cgi/bugzilla-schema/index.cgi?action=single&version=3.0.4&view=View+schema|Schema for 3.0.4]]
+** [[Schema for 3.0.4|http://www.ravenbrook.com/project/p4dti/tool/cgi/bugzilla-schema/index.cgi?action=single&version=3.0.4&view=View+schema]]
 * Our version:
-** [[http://www.ravenbrook.com/project/p4dti/tool/cgi/bugzilla-schema/index.cgi?action=single&version=2.18.6&view=View+schema|Schema for 2.18.6]]
+** [[Schema for 2.18.6|http://www.ravenbrook.com/project/p4dti/tool/cgi/bugzilla-schema/index.cgi?action=single&version=2.18.6&view=View+schema]]
 
 Somehow there's lots of bogus tables there. Not sure why...
 
@@ -23,7 +23,7 @@ DROP TABLE `developers`, `documents`, `functions`, `gl_access`, `gl_article_imag
 }}}
 
 === Upgrade path
-Follow the standard bugzilla instructions. http://www.bugzilla.org/releases/3.0.4/release-notes.html#v30_upgrading
+Follow the standard bugzilla instructions. [[Upgrading|http://www.bugzilla.org/releases/3.0.4/release-notes.html#v30_upgrading]]
  Also, cast encode-detect and run {{{contrib/recode.pl}}} it will go through and update everything to utf8. It needs to be done. {{{./checksetup.pl}}} will warn you about it, but I'm making the note here if you need to do it.
 
 === Afterwards

diff --git a/SourceMage/BugzillaUpgrade.creole b/SourceMage/BugzillaUpgrade.creole
index f8e1ede..0486b22 100755
--- a/SourceMage/BugzillaUpgrade.creole
+++ b/SourceMage/BugzillaUpgrade.creole
@@ -4,15 +4,15 @@
 Oh my God. It's full of perl modules....
 
 === Database
-Many thanks go to `mkanat` on [[irc://irc.mozilla.org/mozwebtools]] for helping me figure this stuff out
+Many thanks go to `mkanat` on [[irc://irc.mozilla.org/mozwebtools|mozwebtools on irc]] for helping me figure this stuff out
 
 Prune the database from fawkes to only include these tables, somehow some junk got into our database :|
 
 Schemas:
 * latest version:
-** [[http://www.ravenbrook.com/project/p4dti/tool/cgi/bugzilla-schema/index.cgi?action=single&version=3.0.4&view=View+schema]]
+** [[http://www.ravenbrook.com/project/p4dti/tool/cgi/bugzilla-schema/index.cgi?action=single&version=3.0.4&view=View+schema|Schema for 3.0.4]]
 * Our version:
-** [[http://www.ravenbrook.com/project/p4dti/tool/cgi/bugzilla-schema/index.cgi?action=single&version=2.18.6&view=View+schema]]
+** [[http://www.ravenbrook.com/project/p4dti/tool/cgi/bugzilla-schema/index.cgi?action=single&version=2.18.6&view=View+schema|Schema for 2.18.6]]
 
 Somehow there's lots of bogus tables there. Not sure why...
 

diff --git a/SourceMage/BugzillaUpgrade.creole b/SourceMage/BugzillaUpgrade.creole
new file mode 100755
index 0000000..f8e1ede
--- /dev/null
+++ b/SourceMage/BugzillaUpgrade.creole
@@ -0,0 +1,32 @@
+== Upgrading our really old ass bugzilla to the latest: 3.0.4
+
+=== Dependencies
+Oh my God. It's full of perl modules....
+
+=== Database
+Many thanks go to `mkanat` on [[irc://irc.mozilla.org/mozwebtools]] for helping me figure this stuff out
+
+Prune the database from fawkes to only include these tables, somehow some junk got into our database :|
+
+Schemas:
+* latest version:
+** [[http://www.ravenbrook.com/project/p4dti/tool/cgi/bugzilla-schema/index.cgi?action=single&version=3.0.4&view=View+schema]]
+* Our version:
+** [[http://www.ravenbrook.com/project/p4dti/tool/cgi/bugzilla-schema/index.cgi?action=single&version=2.18.6&view=View+schema]]
+
+Somehow there's lots of bogus tables there. Not sure why...
+
+Actual code to delete them all:
+
+{{{
+DROP TABLE `developers`, `documents`, `functions`, `gl_access`, `gl_article_images`, `gl_blocks`, `gl_commentcodes`, `gl_commentmodes`, `gl_comments`, `gl_commentspeedlimit`, `gl_cookiecodes`, `gl_dateformats`, `gl_events`, `gl_eventsubmission`, `gl_featurecodes`, `gl_features`, `gl_frontpagecodes`, `gl_groups`, `gl_group_assignments`, `gl_links`, `gl_linksubmission`, `gl_maillist`, `gl_personal_events`, `gl_plugins`, `gl_pollanswers`, `gl_pollquestions`, `gl_pollvoters`, `gl_postmodes`, `gl_sessions`, `gl_sortcodes`, `gl_statuscodes`, `gl_stories`, `gl_storysubmission`, `gl_submitspeedlimit`, `gl_topics`, `gl_tzcodes`, `gl_usercomment`, `gl_userindex`, `gl_userinfo`, `gl_userprefs`, `gl_users`, `gl_vars`, `messu_messages`, `permissions`, `phpbb_auth_access`, `phpbb_banlist`, `phpbb_categories`, `phpbb_config`, `phpbb_disallow`, `phpbb_forums`, `phpbb_forum_prune`, `phpbb_groups`, `phpbb_posts`, `phpbb_posts_text`, `phpbb_privmsgs`, `phpbb_privmsgs_text`, `phpbb_ranks`, `phpbb_search_results`, `phpbb_search_wordmatch`, `phpbb_smilies`, `phpbb_themes`, `phpbb_themes_name`, `phpbb_topics`, `phpbb_topics_watch`, `phpbb_users`, `phpbb_user_group`, `phpbb_vote_desc`, `phpbb_vote_results`, `phpbb_vote_voters`, `phpbb_words`, `project_comments`, `project_issues`, `project_projects`, `project_releases`, `project_subscriptions`, `staticpage`, `users_grouppermissions`, `users_groups`, `users_objectpermissions`, `users_permissions`, `users_usergroups`, `users_users`, `wiki_interwiki`, `wiki_links`, `wiki_pages`, `wiki_rate`, `wiki_remote_pages`, `wiki_sisterwiki`;
+}}}
+
+=== Upgrade path
+Follow the standard bugzilla instructions. http://www.bugzilla.org/releases/3.0.4/release-notes.html#v30_upgrading
+ Also, cast encode-detect and run {{{contrib/recode.pl}}} it will go through and update everything to utf8. It needs to be done. {{{./checksetup.pl}}} will warn you about it, but I'm making the note here if you need to do it.
+
+=== Afterwards
+Run  {{{/usr/share/bugzilla/./collectstats.pl --regenerate}}} That will regenerate things for the old reports.cgi. Takes a long damn time. At least on my vm. OMG, it's taking all day! I don't really want to kill it at 93.9%, but I think I'm going to.
+
+[[!taglink SourceMage]]
diff --git a/SourceMage/BugzillaUpgrade.mdwn b/SourceMage/BugzillaUpgrade.mdwn
deleted file mode 100644
index a25ca0e..0000000
--- a/SourceMage/BugzillaUpgrade.mdwn
+++ /dev/null
@@ -1,30 +0,0 @@
-# Upgrading our really old ass bugzilla to the latest: 3.0.4
-
-##Dependencies
-Oh my God. It's full of perl modules....
-
-##Database
-Many thanks go to `mkanat` on irc://irc.mozilla.org/mozwebtools for helping me figure this stuff out
-
-Prune the database from fawkes to only include these tables, somehow some junk got into our database :|
-
-Schemas:
-* latest version:
- * http://www.ravenbrook.com/project/p4dti/tool/cgi/bugzilla-schema/index.cgi?action=single&version=3.0.4&view=View+schema
-* Our version:
- * http://www.ravenbrook.com/project/p4dti/tool/cgi/bugzilla-schema/index.cgi?action=single&version=2.18.6&view=View+schema
-
-Somehow there's lots of bogus tables there. Not sure why...
-
-Actual code to delete them all:
-
-```DROP TABLE `developers`, `documents`, `functions`, `gl_access`, `gl_article_images`, `gl_blocks`, `gl_commentcodes`, `gl_commentmodes`, `gl_comments`, `gl_commentspeedlimit`, `gl_cookiecodes`, `gl_dateformats`, `gl_events`, `gl_eventsubmission`, `gl_featurecodes`, `gl_features`, `gl_frontpagecodes`, `gl_groups`, `gl_group_assignments`, `gl_links`, `gl_linksubmission`, `gl_maillist`, `gl_personal_events`, `gl_plugins`, `gl_pollanswers`, `gl_pollquestions`, `gl_pollvoters`, `gl_postmodes`, `gl_sessions`, `gl_sortcodes`, `gl_statuscodes`, `gl_stories`, `gl_storysubmission`, `gl_submitspeedlimit`, `gl_topics`, `gl_tzcodes`, `gl_usercomment`, `gl_userindex`, `gl_userinfo`, `gl_userprefs`, `gl_users`, `gl_vars`, `messu_messages`, `permissions`, `phpbb_auth_access`, `phpbb_banlist`, `phpbb_categories`, `phpbb_config`, `phpbb_disallow`, `phpbb_forums`, `phpbb_forum_prune`, `phpbb_groups`, `phpbb_posts`, `phpbb_posts_text`, `phpbb_privmsgs`, `phpbb_privmsgs_text`, `phpbb_ranks`, `phpbb_search_results`, `phpbb_search_wordmatch`, `phpbb_smilies`, `phpbb_themes`, `phpbb_themes_name`, `phpbb_topics`, `phpbb_topics_watch`, `phpbb_users`, `phpbb_user_group`, `phpbb_vote_desc`, `phpbb_vote_results`, `phpbb_vote_voters`, `phpbb_words`, `project_comments`, `project_issues`, `project_projects`, `project_releases`, `project_subscriptions`, `staticpage`, `users_grouppermissions`, `users_groups`, `users_objectpermissions`, `users_permissions`, `users_usergroups`, `users_users`, `wiki_interwiki`, `wiki_links`, `wiki_pages`, `wiki_rate`, `wiki_remote_pages`, `wiki_sisterwiki`;```
-
-##Upgrade path
-Follow the standard bugzilla instructions. http://www.bugzilla.org/releases/3.0.4/release-notes.html#v30_upgrading
- Also, cast encode-detect and run `contrib/recode.pl` it will go through and update everything to utf8. It needs to be done. `./checksetup.pl` will warn you about it, but I'm making the note here if you need to do it.
-
-##Afterwards
-Run  ` /usr/share/bugzilla/./collectstats.pl --regenerate ` That will regenerate things for the old reports.cgi. Takes a long damn time. At least on my vm. OMG, it's taking all day! I don't really want to kill it at 93.9%, but I think I'm going to.
-
-[[!taglink SourceMage]]

diff --git a/copyfilesovernetwork.mdwn b/copyfilesovernetwork.mdwn
index 8a1876c..e8f0909 100644
--- a/copyfilesovernetwork.mdwn
+++ b/copyfilesovernetwork.mdwn
@@ -10,6 +10,10 @@ Start the source first, and then connect the destination to the source. Don't ad
 
     tar -cv <files> | nc -l -p <port> -w 5
 
+###On some systems (fedora) you can't do it that way, nc gets upset when you use -p with-l
+
+    tar -cv <files> | nc -l <port> -w 5
+
 ##Destination:
 
     nc <source> <port> | tar -xv

diff --git a/index.mdwn b/index.mdwn
index d75b3fd..1dec66f 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -11,6 +11,8 @@ Old wiki pages:
 * [[CopyFilesOverNetwork]]
 * [[JabberTransports]]
 
+
+Yet another test
 ----
 
 This wiki is powered by [ikiwiki](http://ikiwiki.info).

diff --git a/test.creole b/test.creole
new file mode 100644
index 0000000..5a74299
--- /dev/null
+++ b/test.creole
@@ -0,0 +1 @@
+== Look I has a test

diff --git a/index.mdwn b/index.mdwn
index 9fdc319..d75b3fd 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -11,8 +11,6 @@ Old wiki pages:
 * [[CopyFilesOverNetwork]]
 * [[JabberTransports]]
 
-A test
-
 ----
 
 This wiki is powered by [ikiwiki](http://ikiwiki.info).

diff --git a/index.mdwn b/index.mdwn
index 1dec66f..ed5c816 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -12,7 +12,6 @@ Old wiki pages:
 * [[JabberTransports]]
 
 
-Yet another test
 ----
 
 This wiki is powered by [ikiwiki](http://ikiwiki.info).

diff --git a/index.mdwn b/index.mdwn
index d75b3fd..9fdc319 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -11,6 +11,8 @@ Old wiki pages:
 * [[CopyFilesOverNetwork]]
 * [[JabberTransports]]
 
+A test
+
 ----
 
 This wiki is powered by [ikiwiki](http://ikiwiki.info).

diff --git a/androidnetbeans.mdwn b/androidnetbeans.mdwn
index 2f25c81..a222534 100644
--- a/androidnetbeans.mdwn
+++ b/androidnetbeans.mdwn
@@ -9,6 +9,7 @@
 3. Run the android tool:
 	<pre><code>android-sdk-linux/tools/android</code></pre>
 4. Use the tool to download the SDK Platform and Google APIs
+ * Most likely you will need to go to settings and select "Force https://... sources to be fetched using http://..."
 5. Add the url for the Android plugin to Netbeans: <http://kenai.com/downloads/nbandroid/updates.xml>
  * Tools > Plugins > Settings > Add
 6. Install the Android plugin

diff --git a/androidnetbeans.mdwn b/androidnetbeans.mdwn
index 17d04c1..2f25c81 100644
--- a/androidnetbeans.mdwn
+++ b/androidnetbeans.mdwn
@@ -1,10 +1,11 @@
 [[!meta title="Android Development on Linux with Netbeans" ]]
 # Android Development on Linux with Netbeans
+[Android Dev Guide](http://developer.android.com/guide/developing/device.html)
 
 1. Get the Android SDK
  * <http://developer.android.com/sdk/index.html>
 2. Extract the SDK:
-     <pre><code>tar -zxf android-sdk_r&lt;version&gt;-linux-x86.tgz</code></pre>
+     <pre><code>tar -zxf android-sdk_r&lt;version&gt;-linux-86.tgz</code></pre>
 3. Run the android tool:
 	<pre><code>android-sdk-linux/tools/android</code></pre>
 4. Use the tool to download the SDK Platform and Google APIs

diff --git a/androidnetbeans.mdwn b/androidnetbeans.mdwn
index cb496ef..17d04c1 100644
--- a/androidnetbeans.mdwn
+++ b/androidnetbeans.mdwn
@@ -8,7 +8,7 @@
 3. Run the android tool:
 	<pre><code>android-sdk-linux/tools/android</code></pre>
 4. Use the tool to download the SDK Platform and Google APIs
-5. Add the url for the Android plugin to Netbeans: http://kenai.com/downloads/nbandroid/updates.xml
+5. Add the url for the Android plugin to Netbeans: <http://kenai.com/downloads/nbandroid/updates.xml>
  * Tools > Plugins > Settings > Add
 6. Install the Android plugin
 7. Make sure the Android device is visible

diff --git a/androidnetbeans.mdwn b/androidnetbeans.mdwn
index 530341a..cb496ef 100644
--- a/androidnetbeans.mdwn
+++ b/androidnetbeans.mdwn
@@ -6,7 +6,7 @@
 2. Extract the SDK:
      <pre><code>tar -zxf android-sdk_r&lt;version&gt;-linux-x86.tgz</code></pre>
 3. Run the android tool:
-	android-sdk-linux/tools/android
+	<pre><code>android-sdk-linux/tools/android</code></pre>
 4. Use the tool to download the SDK Platform and Google APIs
 5. Add the url for the Android plugin to Netbeans: http://kenai.com/downloads/nbandroid/updates.xml
  * Tools > Plugins > Settings > Add

diff --git a/androidnetbeans.mdwn b/androidnetbeans.mdwn
index dba5c0e..530341a 100644
--- a/androidnetbeans.mdwn
+++ b/androidnetbeans.mdwn
@@ -4,8 +4,7 @@
 1. Get the Android SDK
  * <http://developer.android.com/sdk/index.html>
 2. Extract the SDK:
-
-	tar -zxf android-sdk_r<version>-linux-x86.tgz
+     <pre><code>tar -zxf android-sdk_r&lt;version&gt;-linux-x86.tgz</code></pre>
 3. Run the android tool:
 	android-sdk-linux/tools/android
 4. Use the tool to download the SDK Platform and Google APIs
@@ -14,8 +13,7 @@
 6. Install the Android plugin
 7. Make sure the Android device is visible
  * Create a file in /etc/udev/rules.d (99-android.rules is a good choice). Its contents should be:
-
-	SUBSYSTEMS=="usb",ATTRS{idVendor}=="0bb4",MODE=666
+    <pre><code>SUBSYSTEMS=="usb",ATTRS{idVendor}=="0bb4",MODE=666</code></pre>
  * 0x0BB4 is HTC's vendor ID, you'll need to change this if you don't have an HTC device
  * Restart udev (most likely /etc/init.d/udev restart)
  * Replug your device

diff --git a/androidnetbeans.mdwn b/androidnetbeans.mdwn
index 6ae969d..dba5c0e 100644
--- a/androidnetbeans.mdwn
+++ b/androidnetbeans.mdwn
@@ -4,6 +4,7 @@
 1. Get the Android SDK
  * <http://developer.android.com/sdk/index.html>
 2. Extract the SDK:
+
 	tar -zxf android-sdk_r<version>-linux-x86.tgz
 3. Run the android tool:
 	android-sdk-linux/tools/android
@@ -13,6 +14,7 @@
 6. Install the Android plugin
 7. Make sure the Android device is visible
  * Create a file in /etc/udev/rules.d (99-android.rules is a good choice). Its contents should be:
+
 	SUBSYSTEMS=="usb",ATTRS{idVendor}=="0bb4",MODE=666
  * 0x0BB4 is HTC's vendor ID, you'll need to change this if you don't have an HTC device
  * Restart udev (most likely /etc/init.d/udev restart)

diff --git a/androidnetbeans.mdwn b/androidnetbeans.mdwn
index a7dae15..6ae969d 100644
--- a/androidnetbeans.mdwn
+++ b/androidnetbeans.mdwn
@@ -4,19 +4,16 @@
 1. Get the Android SDK
  * <http://developer.android.com/sdk/index.html>
 2. Extract the SDK:
-
-    tar -zxf android-sdk_r<version>-linux-x86.tgz
+	tar -zxf android-sdk_r<version>-linux-x86.tgz
 3. Run the android tool:
-
-    android-sdk-linux/tools/android
+	android-sdk-linux/tools/android
 4. Use the tool to download the SDK Platform and Google APIs
 5. Add the url for the Android plugin to Netbeans: http://kenai.com/downloads/nbandroid/updates.xml
  * Tools > Plugins > Settings > Add
 6. Install the Android plugin
 7. Make sure the Android device is visible
  * Create a file in /etc/udev/rules.d (99-android.rules is a good choice). Its contents should be:
-
-    SUBSYSTEMS=="usb",ATTRS{idVendor}=="0bb4",MODE=666
+	SUBSYSTEMS=="usb",ATTRS{idVendor}=="0bb4",MODE=666
  * 0x0BB4 is HTC's vendor ID, you'll need to change this if you don't have an HTC device
  * Restart udev (most likely /etc/init.d/udev restart)
  * Replug your device

diff --git a/androidnetbeans.mdwn b/androidnetbeans.mdwn
index 3d2ee35..a7dae15 100644
--- a/androidnetbeans.mdwn
+++ b/androidnetbeans.mdwn
@@ -1,4 +1,4 @@
-[[! meta title="Android Development on Linux with Netbeans" ]]
+[[!meta title="Android Development on Linux with Netbeans" ]]
 # Android Development on Linux with Netbeans
 
 1. Get the Android SDK

diff --git a/androidnetbeans.mdwn b/androidnetbeans.mdwn
new file mode 100644
index 0000000..3d2ee35
--- /dev/null
+++ b/androidnetbeans.mdwn
@@ -0,0 +1,33 @@
+[[! meta title="Android Development on Linux with Netbeans" ]]
+# Android Development on Linux with Netbeans
+
+1. Get the Android SDK
+ * <http://developer.android.com/sdk/index.html>
+2. Extract the SDK:
+
+    tar -zxf android-sdk_r<version>-linux-x86.tgz
+3. Run the android tool:
+
+    android-sdk-linux/tools/android
+4. Use the tool to download the SDK Platform and Google APIs
+5. Add the url for the Android plugin to Netbeans: http://kenai.com/downloads/nbandroid/updates.xml
+ * Tools > Plugins > Settings > Add
+6. Install the Android plugin
+7. Make sure the Android device is visible
+ * Create a file in /etc/udev/rules.d (99-android.rules is a good choice). Its contents should be:
+
+    SUBSYSTEMS=="usb",ATTRS{idVendor}=="0bb4",MODE=666
+ * 0x0BB4 is HTC's vendor ID, you'll need to change this if you don't have an HTC device
+ * Restart udev (most likely /etc/init.d/udev restart)
+ * Replug your device
+8. Add a new Project in Netbeans
+9. You'll now have an Android project type.
+10. On the project naming page, you'll need to setup the SDK as a platform.
+ * Click "Manage Platforms"
+ * "Add Platform"
+ * Select "Google Android Open Handheld Platform"
+ * Browse to where you extracted the SDK files
+ * Select a type (I suggest a Google API type) and choose a name.
+11. Continue with the project creation.
+12. On the services page, there should be a Android Devices node and your device should be listed under it.
+13. If you want to work with a virtual device, this can be created with the android tool mentioned above.

diff --git a/Fedora/XenDomain0.mdwn b/Fedora/XenDomain0.mdwn
index 0919df7..e78fafa 100644
--- a/Fedora/XenDomain0.mdwn
+++ b/Fedora/XenDomain0.mdwn
@@ -4,6 +4,7 @@ but it's less than ideal. I'd much rather have an RPM that I can reuse/give away
 
 #TODO
 Steps that I need to do:
+
 * Build a xen kernel .spec file
 * use the patches from http://code.google.com/p/gentoo-xen-kernel/downloads/list
 * Start with 2.6.29.6, since I know that works

diff --git a/Fedora/XenDomain0.mdwn b/Fedora/XenDomain0.mdwn
index 70051aa..0919df7 100644
--- a/Fedora/XenDomain0.mdwn
+++ b/Fedora/XenDomain0.mdwn
@@ -4,10 +4,10 @@ but it's less than ideal. I'd much rather have an RPM that I can reuse/give away
 
 #TODO
 Steps that I need to do:
- * Build a xen kernel .spec file
- * use the patches from http://code.google.com/p/gentoo-xen-kernel/downloads/list
- * Start with 2.6.29.6, since I know that works
- * Have the xen kernel depend on the xen hypervisor package, since a xen kernel will NOT boot without it
- * build it so that the .spec file can download the patches from the gentoo-xen-kernel site
+* Build a xen kernel .spec file
+* use the patches from http://code.google.com/p/gentoo-xen-kernel/downloads/list
+* Start with 2.6.29.6, since I know that works
+* Have the xen kernel depend on the xen hypervisor package, since a xen kernel will NOT boot without it
+* build it so that the .spec file can download the patches from the gentoo-xen-kernel site
 
 [[!taglink Fedora]]

diff --git a/index.mdwn b/index.mdwn
index e40589e..d75b3fd 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -2,6 +2,8 @@ ikiwiki is the awesome
 
 [[TODO]] has a list of things I need to get done.
 
+[[Fedora]] projects!
+
 [[SourceMage]] Projects!
 
 Old wiki pages:

diff --git a/Fedora.mdwn b/Fedora.mdwn
new file mode 100644
index 0000000..63c73a2
--- /dev/null
+++ b/Fedora.mdwn
@@ -0,0 +1,10 @@
+I've started to pick up Fedora as my distro of choice. Been spending too much time on the simplistic details instead 
+of getting work done. And I'm getting tired of it. I want to do work using linux, rather than work on linux.
+This doesn't mean that I'm abandoning SourceMage, in fact, I'll likely keep using SourceMage, just for different things.
+
+My first hurdle in using Fedora is getting a Xen Domain0 out of it. The upstream fedora kernel supports being a DomU with no problems.
+
+
+[[!map pages="Fedora/* and !*/Discussion" ]]
+
+[[!taglink Fedora]]
diff --git a/Fedora/XenDomain0.mdwn b/Fedora/XenDomain0.mdwn
new file mode 100644
index 0000000..70051aa
--- /dev/null
+++ b/Fedora/XenDomain0.mdwn
@@ -0,0 +1,13 @@
+#Domain 0
+I have built and installed a custom kernel using the standard make && make install process. That works pretty well
+but it's less than ideal. I'd much rather have an RPM that I can reuse/give away.
+
+#TODO
+Steps that I need to do:
+ * Build a xen kernel .spec file
+ * use the patches from http://code.google.com/p/gentoo-xen-kernel/downloads/list
+ * Start with 2.6.29.6, since I know that works
+ * Have the xen kernel depend on the xen hypervisor package, since a xen kernel will NOT boot without it
+ * build it so that the .spec file can download the patches from the gentoo-xen-kernel site
+
+[[!taglink Fedora]]

diff --git a/SourceMage.mdwn b/SourceMage.mdwn
index e3c234d..55d6ed6 100644
--- a/SourceMage.mdwn
+++ b/SourceMage.mdwn
@@ -5,6 +5,12 @@
 I don't like having to learn the Distro specific way of doing thins. Source Mage doesn't do anything that shouldn't be done. What that really means: The distro stays out of the admin's way. It doesn't do anything but automate the installing and uninstalling of packages. No default configs, except what is provided by the upstream software provider. No fancy configuration tools to build system configuration. Only VI (as if there was any other editor ;P) and text files galore.
 Amazingly this keeps things very simple.
 
+# What I dislike :(
+I have come to be very irritated at a few things in SMGL. I will attempt to detail the items and get some work done on them. I actually feel somewhat motivated to do so, and I think it would benefit the Source Mage User Community greatly.
+
+## Standardized Metadata files
+The `DETAILS`, `DEPENDS`, `CONFIGURE`, `SUB_DEPENDS`, and `PRE_SUBDEPENDS` files all describe metadata for a spell. They don't do any of the building, only describe how to prep the environment, or how to get it. Standardizing the content of these files could provide a significant benefit to the community. Many different frontents could easily be implemented for configuration, rather than just the current command line interface. Also, validation could happen, given a DTD or a schema file. This can improve the quality of the files and help prevent bugs. Downsides are that it's not as simple to add more logic to the system as it is when the file is pure bash. But I think the benefits outweigh the potential losses. Especially when it comes to automated version updates and testing automated builds. Having a standardized API, possibly building off some already existing format, like YAML, would allow for much more automation to happen. Using something like YAML still allows for easy human editing of the file, which is very important. It also keeps the files on the disk, and doesn't mandate the use of a precompiled database, which is difficult to modfy by hand when the system is operational.
+
 # Work?
 I do some work on the project, although not as much as I like. I tend to have motivational issues. I get burnt out at work, instead of being spun up :( Anyways, this page will have links to projects that I think up or intend to work on, or might have worked on, once or otherwise.
 

diff --git a/index.mdwn b/index.mdwn
index 13bfb4a..e40589e 100644
--- a/index.mdwn
+++ b/index.mdwn
@@ -6,8 +6,8 @@ ikiwiki is the awesome
 
 Old wiki pages:
 
-* CopyFilesOverNetwork
-* JabberTransports
+* [[CopyFilesOverNetwork]]
+* [[JabberTransports]]
 
 ----
 

diff --git a/SourceMage/BugzillaUpgrade.mdwn b/SourceMage/BugzillaUpgrade.mdwn
index 68a1a7b..a25ca0e 100644
--- a/SourceMage/BugzillaUpgrade.mdwn
+++ b/SourceMage/BugzillaUpgrade.mdwn
@@ -18,13 +18,13 @@ Somehow there's lots of bogus tables there. Not sure why...
 
 Actual code to delete them all:
 
-	DROP TABLE `developers`, `documents`, `functions`, `gl_access`, `gl_article_images`, `gl_blocks`, `gl_commentcodes`, `gl_commentmodes`, `gl_comments`, `gl_commentspeedlimit`, `gl_cookiecodes`, `gl_dateformats`, `gl_events`, `gl_eventsubmission`, `gl_featurecodes`, `gl_features`, `gl_frontpagecodes`, `gl_groups`, `gl_group_assignments`, `gl_links`, `gl_linksubmission`, `gl_maillist`, `gl_personal_events`, `gl_plugins`, `gl_pollanswers`, `gl_pollquestions`, `gl_pollvoters`, `gl_postmodes`, `gl_sessions`, `gl_sortcodes`, `gl_statuscodes`, `gl_stories`, `gl_storysubmission`, `gl_submitspeedlimit`, `gl_topics`, `gl_tzcodes`, `gl_usercomment`, `gl_userindex`, `gl_userinfo`, `gl_userprefs`, `gl_users`, `gl_vars`, `messu_messages`, `permissions`, `phpbb_auth_access`, `phpbb_banlist`, `phpbb_categories`, `phpbb_config`, `phpbb_disallow`, `phpbb_forums`, `phpbb_forum_prune`, `phpbb_groups`, `phpbb_posts`, `phpbb_posts_text`, `phpbb_privmsgs`, `phpbb_privmsgs_text`, `phpbb_ranks`, `phpbb_search_results`, `phpbb_search_wordmatch`, `phpbb_smilies`, `phpbb_themes`, `phpbb_themes_name`, `phpbb_topics`, `phpbb_topics_watch`, `phpbb_users`, `phpbb_user_group`, `phpbb_vote_desc`, `phpbb_vote_results`, `phpbb_vote_voters`, `phpbb_words`, `project_comments`, `project_issues`, `project_projects`, `project_releases`, `project_subscriptions`, `staticpage`, `users_grouppermissions`, `users_groups`, `users_objectpermissions`, `users_permissions`, `users_usergroups`, `users_users`, `wiki_interwiki`, `wiki_links`, `wiki_pages`, `wiki_rate`, `wiki_remote_pages`, `wiki_sisterwiki`;
+```DROP TABLE `developers`, `documents`, `functions`, `gl_access`, `gl_article_images`, `gl_blocks`, `gl_commentcodes`, `gl_commentmodes`, `gl_comments`, `gl_commentspeedlimit`, `gl_cookiecodes`, `gl_dateformats`, `gl_events`, `gl_eventsubmission`, `gl_featurecodes`, `gl_features`, `gl_frontpagecodes`, `gl_groups`, `gl_group_assignments`, `gl_links`, `gl_linksubmission`, `gl_maillist`, `gl_personal_events`, `gl_plugins`, `gl_pollanswers`, `gl_pollquestions`, `gl_pollvoters`, `gl_postmodes`, `gl_sessions`, `gl_sortcodes`, `gl_statuscodes`, `gl_stories`, `gl_storysubmission`, `gl_submitspeedlimit`, `gl_topics`, `gl_tzcodes`, `gl_usercomment`, `gl_userindex`, `gl_userinfo`, `gl_userprefs`, `gl_users`, `gl_vars`, `messu_messages`, `permissions`, `phpbb_auth_access`, `phpbb_banlist`, `phpbb_categories`, `phpbb_config`, `phpbb_disallow`, `phpbb_forums`, `phpbb_forum_prune`, `phpbb_groups`, `phpbb_posts`, `phpbb_posts_text`, `phpbb_privmsgs`, `phpbb_privmsgs_text`, `phpbb_ranks`, `phpbb_search_results`, `phpbb_search_wordmatch`, `phpbb_smilies`, `phpbb_themes`, `phpbb_themes_name`, `phpbb_topics`, `phpbb_topics_watch`, `phpbb_users`, `phpbb_user_group`, `phpbb_vote_desc`, `phpbb_vote_results`, `phpbb_vote_voters`, `phpbb_words`, `project_comments`, `project_issues`, `project_projects`, `project_releases`, `project_subscriptions`, `staticpage`, `users_grouppermissions`, `users_groups`, `users_objectpermissions`, `users_permissions`, `users_usergroups`, `users_users`, `wiki_interwiki`, `wiki_links`, `wiki_pages`, `wiki_rate`, `wiki_remote_pages`, `wiki_sisterwiki`;```
 
 ##Upgrade path
 Follow the standard bugzilla instructions. http://www.bugzilla.org/releases/3.0.4/release-notes.html#v30_upgrading
  Also, cast encode-detect and run `contrib/recode.pl` it will go through and update everything to utf8. It needs to be done. `./checksetup.pl` will warn you about it, but I'm making the note here if you need to do it.
 
-== Afterwards ==
+##Afterwards
 Run  ` /usr/share/bugzilla/./collectstats.pl --regenerate ` That will regenerate things for the old reports.cgi. Takes a long damn time. At least on my vm. OMG, it's taking all day! I don't really want to kill it at 93.9%, but I think I'm going to.
 
 [[!taglink SourceMage]]

diff --git a/SourceMage/CPANPLUS.mdwn b/SourceMage/CPANPLUS.mdwn
index 75cffac..699f912 100644
--- a/SourceMage/CPANPLUS.mdwn
+++ b/SourceMage/CPANPLUS.mdwn
@@ -18,15 +18,11 @@ I have developed an extremely simple program that uses CPANPLUS to get the depen
 
 The repo is available at `git://scm.shlrm.org/cpanSpells.git`. There's not much there at the moment, but it proves that dependencies can be gleaned. The current script doesn't even clean up after itself, but that shouldn't be a very big deal.
 
-##Ruby or Perl?
-There's a META.yml file in each perl module's tar.gz file. It's got a spec from the module builder file, so I think it'll be relatively easy for me to hack together a ruby script that can figure all this stuff out. The only difficult part might be interfacing directly with CPAN to download the stuff. I'll look into that part as well, I should be able to theif things from quill. Then it'll be really simple because I can get all the information I need from that META.yml.
-
-This doesn't solve the problem of trying to interface directly with sorcery, but I'm not sure I want to spend that much time trying to figure out perl to get that done.
-
-I've gotten some more done in there, installed the yaml module for perl and figured out how to deal with references to hashes to references to hashes. So now I can pull the information out in pure perl. So lets have it generate spells for me now :D.
-
 # Spell Generation
 
+## Repository
+`git://scm.shlrm.org/cpanSpells.git`
+
 ## Notes
 Sections of note:
 
@@ -50,35 +46,37 @@ Don't forget:
 Since quill isn't quite doing the same thing I'm doing, I'll have to implement parts of quill in perl.
 It shouldn't be too difficult, to do the parts i need to do.
 
-* Configuration options
- * Need a git dir to use
- * possibly command line flags for different search options
-  * [Here's the search stuff](http://search.cpan.org/~kane/CPANPLUS-0.88/lib/CPANPLUS/Backend.pm#$mod_obj_=_$cb-%3Eparse_module%28_module_=%3E_$modname|$distname|$modobj|URI|PATH_%29 "Search Stuff")
- * configurable download dir and extraction dir
-* Overall
- * download source, with option to put it into `/var/spool/sorcery`
- * clean up extracted stuff when exiting
-* Creating a new spell
- * easiest part, just dump the files into a directory!
-* Searching for already existing spells to satisfy dependencies
- * specify a git directory to work off of
- * Best spell detection method
-  * several spells aren't named "correctly" but are named by their module instead of the package that provides the module
-  * Should probably try to detect off the VERSION variable and the SOURCE variable to see if the package is in a different spell
-  * Should then notify the user that that spell needs to be deprecated and renamed to the package
- * If the spell doesn't exist and this package needs it, fire up another generation process to build another spell
- * need to be able to determine if the package is in the base perl install or not
- * need to double-check version of existing spells to ensure they meet the minimum required by the package being created
-  * if not, fire up an update of that package...
-* Updating a spell
- * Change only certain attributes of the spell
-  * VERSION, SOURCEURL, and SOURCEHASH
- * Possibly check the DETAILS file for `if` statements to ensure we're not going to clobber stuff
- * verify that the right dependencies exist in the DEPENDS file
-  * search for `depends thinger`
-   * If it doesn't exist, fire up creation of a new spell, and add it to the DEPENDS
-  * same for `optional_depends thinger`
-
-
+###Configuration options
+* Need a git dir to use
+* possibly command line flags for different search options
+ * [Here's the search stuff](http://search.cpan.org/~kane/CPANPLUS-0.88/lib/CPANPLUS/Backend.pm#$mod_obj_=_$cb-%3Eparse_module%28_module_=%3E_$modname|$distname|$modobj|URI|PATH_%29 "Search Stuff")
+* configurable download dir and extraction dir
+
+###Overall
+* download source, with option to put it into `/var/spool/sorcery`
+* clean up extracted stuff when exiting
+
+###Creating a new spell
+* easiest part, just dump the files into a directory!
+
+###Searching for already existing spells to satisfy dependencies
+* specify a git directory to work off of
+* Best spell detection method
+ * several spells aren't named "correctly" but are named by their module instead of the package that provides the module
+ * Should probably try to detect off the VERSION variable and the SOURCE variable to see if the package is in a different spell
+ * Should then notify the user that that spell needs to be deprecated and renamed to the package
+* If the spell doesn't exist and this package needs it, fire up another generation process to build another spell
+* need to be able to determine if the package is in the base perl install or not
+* need to double-check version of existing spells to ensure they meet the minimum required by the package being created
+ * if not, fire up an update of that package...
+
+###Updating a spell
+* Change only certain attributes of the spell
+ * VERSION, SOURCEURL, and SOURCEHASH
+* Possibly check the DETAILS file for `if` statements to ensure we're not going to clobber stuff
+* verify that the right dependencies exist in the DEPENDS file
+ * search for `depends thinger`
+  * If it doesn't exist, fire up creation of a new spell, and add it to the DEPENDS
+ * same for `optional_depends thinger`
 
 [[!taglink SourceMage]]

diff --git a/SourceMage/CPANPLUS.mdwn b/SourceMage/CPANPLUS.mdwn
index eeb1b51..75cffac 100644
--- a/SourceMage/CPANPLUS.mdwn
+++ b/SourceMage/CPANPLUS.mdwn
@@ -1,4 +1,4 @@
-[[!toc ]]
+[[!toc levels=2]]
 ----
 #Integrating CPANPLUS into Sorcery
 Well, kinda. The idea is to build it so that you don't need to spellify the entire perl-cpan repo. Just cast something that's perl and it just works. Perhaps match on any `perl-cpan-$spell`

diff --git a/SourceMage/CPANPLUS.mdwn b/SourceMage/CPANPLUS.mdwn
index 3783e2c..eeb1b51 100644
--- a/SourceMage/CPANPLUS.mdwn
+++ b/SourceMage/CPANPLUS.mdwn
@@ -1,3 +1,5 @@
+[[!toc ]]
+----
 #Integrating CPANPLUS into Sorcery
 Well, kinda. The idea is to build it so that you don't need to spellify the entire perl-cpan repo. Just cast something that's perl and it just works. Perhaps match on any `perl-cpan-$spell`
 
@@ -42,8 +44,41 @@ Updating is a corner case of creating a new spell, if files exist already, dump
 
 Don't forget:
 
-* UPDATED: in DETAILS
 * Prepend history entry into HISTORY
 
+## cpanQuill
+Since quill isn't quite doing the same thing I'm doing, I'll have to implement parts of quill in perl.
+It shouldn't be too difficult, to do the parts i need to do.
+
+* Configuration options
+ * Need a git dir to use
+ * possibly command line flags for different search options
+  * [Here's the search stuff](http://search.cpan.org/~kane/CPANPLUS-0.88/lib/CPANPLUS/Backend.pm#$mod_obj_=_$cb-%3Eparse_module%28_module_=%3E_$modname|$distname|$modobj|URI|PATH_%29 "Search Stuff")
+ * configurable download dir and extraction dir
+* Overall
+ * download source, with option to put it into `/var/spool/sorcery`
+ * clean up extracted stuff when exiting
+* Creating a new spell
+ * easiest part, just dump the files into a directory!
+* Searching for already existing spells to satisfy dependencies
+ * specify a git directory to work off of
+ * Best spell detection method
+  * several spells aren't named "correctly" but are named by their module instead of the package that provides the module
+  * Should probably try to detect off the VERSION variable and the SOURCE variable to see if the package is in a different spell
+  * Should then notify the user that that spell needs to be deprecated and renamed to the package
+ * If the spell doesn't exist and this package needs it, fire up another generation process to build another spell
+ * need to be able to determine if the package is in the base perl install or not
+ * need to double-check version of existing spells to ensure they meet the minimum required by the package being created
+  * if not, fire up an update of that package...
+* Updating a spell
+ * Change only certain attributes of the spell
+  * VERSION, SOURCEURL, and SOURCEHASH
+ * Possibly check the DETAILS file for `if` statements to ensure we're not going to clobber stuff
+ * verify that the right dependencies exist in the DEPENDS file
+  * search for `depends thinger`
+   * If it doesn't exist, fire up creation of a new spell, and add it to the DEPENDS
+  * same for `optional_depends thinger`
+
+
 
 [[!taglink SourceMage]]

diff --git a/SourceMage/CPANPLUS.mdwn b/SourceMage/CPANPLUS.mdwn
index 52d4553..3783e2c 100644
--- a/SourceMage/CPANPLUS.mdwn
+++ b/SourceMage/CPANPLUS.mdwn
@@ -31,6 +31,7 @@ Sections of note:
 * hard dependencies
  * `requires`
  * `build_requires`
+ * `configure_requires`
 * optional dependencies
  * `recommends`
 

diff --git a/SourceMage/CPANPLUS.mdwn b/SourceMage/CPANPLUS.mdwn
index 04dde27..52d4553 100644
--- a/SourceMage/CPANPLUS.mdwn
+++ b/SourceMage/CPANPLUS.mdwn
@@ -32,7 +32,7 @@ Sections of note:
  * `requires`
  * `build_requires`
 * optional dependencies
- * recommends
+ * `recommends`
 
 
 ## Thoughts

diff --git a/SourceMage/CPANPLUS.mdwn b/SourceMage/CPANPLUS.mdwn
index f0f9446..04dde27 100644
--- a/SourceMage/CPANPLUS.mdwn
+++ b/SourceMage/CPANPLUS.mdwn
@@ -9,6 +9,7 @@ Well, kinda. The idea is to build it so that you don't need to spellify the enti
  * <http://search.cpan.org/~kane/CPANPLUS-0.88/lib/CPANPLUS/Backend.pm>
  * <http://search.cpan.org/~kane/CPANPLUS-0.88/lib/CPANPLUS/Module.pm>
  * <http://search.cpan.org/~kane/CPANPLUS-0.88/lib/CPANPLUS.pm#API_REFERENCE>
+ * <http://module-build.sourceforge.net/META-spec.html> META.yml Spec!
 
 ##Progress!
 I have developed an extremely simple program that uses CPANPLUS to get the dependency information from CPAN. There's a perl module called [CPANPLUS::Dist](http://search.cpan.org/~kane/CPANPLUS-0.88/lib/CPANPLUS/Dist.pm) which could do a whole lot of good things I think. Gentoo has an implementaiton of this to generate the packages for their portage.
@@ -24,6 +25,16 @@ I've gotten some more done in there, installed the yaml module for perl and figu
 
 # Spell Generation
 
+## Notes
+Sections of note:
+
+* hard dependencies
+ * `requires`
+ * `build_requires`
+* optional dependencies
+ * recommends
+
+
 ## Thoughts
 Creating a new spell is easy, just dump all the stuff into the spell files as appropriate.
 Updating is a corner case of creating a new spell, if files exist already, dump the files a bit differently. Assuming of course that there's no special logic in the files to begin with, but that's technically not my problem.

diff --git a/SourceMage/CPANPLUS.mdwn b/SourceMage/CPANPLUS.mdwn
index 8b18ecb..f0f9446 100644
--- a/SourceMage/CPANPLUS.mdwn
+++ b/SourceMage/CPANPLUS.mdwn
@@ -15,12 +15,23 @@ I have developed an extremely simple program that uses CPANPLUS to get the depen
 
 The repo is available at `git://scm.shlrm.org/cpanSpells.git`. There's not much there at the moment, but it proves that dependencies can be gleaned. The current script doesn't even clean up after itself, but that shouldn't be a very big deal.
 
-##I hate perl
-God perl sucks. And so does it documentation. Trying to use a module, specifically CPANPLUS, and configure things so i can get less information about it is impossible, because the documentationis wrong, and I don't know enough to figure out what it is I'm supposed to do! Anyways...
-
-##Ruby?
+##Ruby or Perl?
 There's a META.yml file in each perl module's tar.gz file. It's got a spec from the module builder file, so I think it'll be relatively easy for me to hack together a ruby script that can figure all this stuff out. The only difficult part might be interfacing directly with CPAN to download the stuff. I'll look into that part as well, I should be able to theif things from quill. Then it'll be really simple because I can get all the information I need from that META.yml.
 
 This doesn't solve the problem of trying to interface directly with sorcery, but I'm not sure I want to spend that much time trying to figure out perl to get that done.
 
+I've gotten some more done in there, installed the yaml module for perl and figured out how to deal with references to hashes to references to hashes. So now I can pull the information out in pure perl. So lets have it generate spells for me now :D.
+
+# Spell Generation
+
+## Thoughts
+Creating a new spell is easy, just dump all the stuff into the spell files as appropriate.
+Updating is a corner case of creating a new spell, if files exist already, dump the files a bit differently. Assuming of course that there's no special logic in the files to begin with, but that's technically not my problem.
+
+Don't forget:
+
+* UPDATED: in DETAILS
+* Prepend history entry into HISTORY
+
+
 [[!taglink SourceMage]]

diff --git a/SourceMage/CPANPLUS.mdwn b/SourceMage/CPANPLUS.mdwn
index 218c08c..8b18ecb 100644
--- a/SourceMage/CPANPLUS.mdwn
+++ b/SourceMage/CPANPLUS.mdwn
@@ -15,4 +15,12 @@ I have developed an extremely simple program that uses CPANPLUS to get the depen
 
 The repo is available at `git://scm.shlrm.org/cpanSpells.git`. There's not much there at the moment, but it proves that dependencies can be gleaned. The current script doesn't even clean up after itself, but that shouldn't be a very big deal.
 
+##I hate perl
+God perl sucks. And so does it documentation. Trying to use a module, specifically CPANPLUS, and configure things so i can get less information about it is impossible, because the documentationis wrong, and I don't know enough to figure out what it is I'm supposed to do! Anyways...
+
+##Ruby?
+There's a META.yml file in each perl module's tar.gz file. It's got a spec from the module builder file, so I think it'll be relatively easy for me to hack together a ruby script that can figure all this stuff out. The only difficult part might be interfacing directly with CPAN to download the stuff. I'll look into that part as well, I should be able to theif things from quill. Then it'll be really simple because I can get all the information I need from that META.yml.
+
+This doesn't solve the problem of trying to interface directly with sorcery, but I'm not sure I want to spend that much time trying to figure out perl to get that done.
+
 [[!taglink SourceMage]]

diff --git a/SourceMage/CPANPLUS.mdwn b/SourceMage/CPANPLUS.mdwn
index 4fcb0e2..218c08c 100644
--- a/SourceMage/CPANPLUS.mdwn
+++ b/SourceMage/CPANPLUS.mdwn
@@ -11,7 +11,7 @@ Well, kinda. The idea is to build it so that you don't need to spellify the enti
  * <http://search.cpan.org/~kane/CPANPLUS-0.88/lib/CPANPLUS.pm#API_REFERENCE>
 
 ##Progress!
-I have developed an extremely simple program that uses CPANPLUS to get the dependency information from CPAN. There's a perl module called (CPANPLUS::Dist)[http://search.cpan.org/~kane/CPANPLUS-0.88/lib/CPANPLUS/Dist.pm] which could do a whole lot of good things I think. Gentoo has an implementaiton of this to generate the packages for their portage.
+I have developed an extremely simple program that uses CPANPLUS to get the dependency information from CPAN. There's a perl module called [CPANPLUS::Dist](http://search.cpan.org/~kane/CPANPLUS-0.88/lib/CPANPLUS/Dist.pm) which could do a whole lot of good things I think. Gentoo has an implementaiton of this to generate the packages for their portage.
 
 The repo is available at `git://scm.shlrm.org/cpanSpells.git`. There's not much there at the moment, but it proves that dependencies can be gleaned. The current script doesn't even clean up after itself, but that shouldn't be a very big deal.
 

diff --git a/SourceMage/CPANPLUS.mdwn b/SourceMage/CPANPLUS.mdwn
index aa3348a..4fcb0e2 100644
--- a/SourceMage/CPANPLUS.mdwn
+++ b/SourceMage/CPANPLUS.mdwn
@@ -10,4 +10,9 @@ Well, kinda. The idea is to build it so that you don't need to spellify the enti
  * <http://search.cpan.org/~kane/CPANPLUS-0.88/lib/CPANPLUS/Module.pm>
  * <http://search.cpan.org/~kane/CPANPLUS-0.88/lib/CPANPLUS.pm#API_REFERENCE>
 
+##Progress!
+I have developed an extremely simple program that uses CPANPLUS to get the dependency information from CPAN. There's a perl module called (CPANPLUS::Dist)[http://search.cpan.org/~kane/CPANPLUS-0.88/lib/CPANPLUS/Dist.pm] which could do a whole lot of good things I think. Gentoo has an implementaiton of this to generate the packages for their portage.
+
+The repo is available at `git://scm.shlrm.org/cpanSpells.git`. There's not much there at the moment, but it proves that dependencies can be gleaned. The current script doesn't even clean up after itself, but that shouldn't be a very big deal.
+
 [[!taglink SourceMage]]

diff --git a/SourceMage/SMGLStats.mdwn b/SourceMage/SMGLStats.mdwn
index 13ef2f4..6711608 100644
--- a/SourceMage/SMGLStats.mdwn
+++ b/SourceMage/SMGLStats.mdwn
@@ -3,6 +3,7 @@
 #In the beginning...
 ...there was ledger. It was a student's project and did a few things well. Good start. Collected statistics from a machine based on a script it runs. It would then update a website and we could see how many machines people were running.
 Features:
+
  * Showed Geographic Location
  * Showed a list of users
  * Showed how many machines a user has

diff --git a/SourceMage/CPANPLUS.mdwn b/SourceMage/CPANPLUS.mdwn
index 7e7d561..aa3348a 100644
--- a/SourceMage/CPANPLUS.mdwn
+++ b/SourceMage/CPANPLUS.mdwn
@@ -6,8 +6,8 @@ Well, kinda. The idea is to build it so that you don't need to spellify the enti
 	along w/ the files it installs, plus the dependencies it pulls in
 
 ###URLs
- * <http://search.cpan.org/~kane/CPANPLUS-0.84/lib/CPANPLUS/Backend.pm>
- * <http://search.cpan.org/~kane/CPANPLUS-0.84/lib/CPANPLUS/Module.pm>
- * <http://search.cpan.org/~kane/CPANPLUS-0.84/lib/CPANPLUS.pm#API_REFERENCE>
+ * <http://search.cpan.org/~kane/CPANPLUS-0.88/lib/CPANPLUS/Backend.pm>
+ * <http://search.cpan.org/~kane/CPANPLUS-0.88/lib/CPANPLUS/Module.pm>
+ * <http://search.cpan.org/~kane/CPANPLUS-0.88/lib/CPANPLUS.pm#API_REFERENCE>
 
 [[!taglink SourceMage]]

diff --git a/todo.mdwn b/todo.mdwn
index 1eb4dfc..7a0fc59 100644
--- a/todo.mdwn
+++ b/todo.mdwn
@@ -1,5 +1,5 @@
-* Get the old wiki transferred into this one
-* build a page for documenting using CPANPLUS to create perl-cpan spells
+* Get the old wiki transferred into this one - **DONE**!
+* build a page for documenting using CPANPLUS to create perl-cpan spells -- Partially done
  * High priority since ikiwiki is in perl and as such, uses lots of perl modules
 * look into converting my entire website into ikiwiki
 * look into other formatting methods besides markdown

diff --git a/SourceMage/Traceroute.mdwn b/SourceMage/Traceroute.mdwn
index b3ee5d1..4d24961 100644
--- a/SourceMage/Traceroute.mdwn
+++ b/SourceMage/Traceroute.mdwn
@@ -5,6 +5,7 @@ Well one day I noticed at work that Time Warner Cable's connection to download.s
 
 #Free
 From lejatorn's home
+
 	traceroute to download.sourcemage.org (66.101.58.203), 30 hops max, 40 byte packets
 	 1  192.168.0.254 (192.168.0.254)  1.153 ms  1.141 ms  0.869 ms
 	 2  88.166.34.254 (88.166.34.254)  29.448 ms  54.579 ms  28.993 ms
@@ -24,6 +25,7 @@ From lejatorn's home
 
 #Time Warner Cable
 From dkowis' workplace
+
 	traceroute to download.sourcemage.org (66.101.58.203), 30 hops max, 40 byte packets
 	 1  192.168.2.1 (192.168.2.1)  0.412 ms  0.311 ms  0.229 ms
 	 2  10.44.128.1 (10.44.128.1)  10.957 ms  8.349 ms  9.747 ms
@@ -43,6 +45,7 @@ From dkowis' workplace
 	16  www.sourcemage.org (66.101.58.203)  51.432 ms  51.075 ms atm8-0-0201.CR-1.usdlls.savvis.net (64.240.32.42)  54.183 ms
 
 #Time Warner Telecom
+
 	traceroute to www.sourcemage.org (66.101.58.203), 30 hops max, 40 byte packets
 	 1  192.168.2.1 (192.168.2.1)  0.298 ms  0.425 ms  0.239 ms
 	 2  207-71-24-129.static.twtelecom.net (207.71.24.129)  2.236 ms  2.430 ms  2.237 ms
@@ -58,6 +61,7 @@ From dkowis' workplace
 
 #AT&T
 From dkowis' home
+
 	traceroute to download.sourcemage.org (66.101.58.203), 30 hops max, 40 byte packets
 	 1  moebius (10.10.220.254)  0.203 ms  0.237 ms  0.189 ms
 	 2  192.0.2.100 (192.0.2.100)  2.398 ms  2.726 ms  2.536 ms
@@ -73,6 +77,7 @@ From dkowis' home
 
 #PRTC
 From ryuji's home in Puerto Rico
+
 	traceroute to download.sourcemage.org (66.101.58.203), 30 hops max, 40 byte packets
 	 1  poseidon.dragonboricua.com (64.237.215.8)  1 ms  1 ms  1 ms
 	 2  196-28-53-94.prtc.net (196.28.53.94)  11.561 ms  26.203 ms  11.678 ms
@@ -93,6 +98,7 @@ From ryuji's home in Puerto Rico
 
 #German Telekom
 From alley_cats alley in Germany.
+
 	traceroute to download.sourcemage.org (66.101.58.203), 30 hops max, 40 byte packets
 	 1  * * *
 	 2  217.0.74.198 (217.0.74.198)  45.071 ms  40.150 ms  40.708 ms
@@ -108,6 +114,7 @@ From alley_cats alley in Germany.
 
 #SuddenLink
 From Maffoo``Clock's home in San Angelo, TX
+
 	traceroute to download.sourcemage.org (209.245.211.125), 30 hops max, 40 byte packets
 	 1  10.248.208.1 (10.248.208.1)  6.874 ms  17.561 ms  7.952 ms
 	 2  cdm-66-76-46-165.susp.suddenlink.net (66.76.46.165)  9.449 ms  6.579 ms  8.220 ms
@@ -122,6 +129,7 @@ From Maffoo``Clock's home in San Angelo, TX
 	11  209.245.211.125 (209.245.211.125)  39.534 ms  39.061 ms  40.415 ms
 
 #Flux Control's lazy VERIZON butt
+
 	flux@shaolin:~$ traceroute -I download.sourcemage.org
 	traceroute to download.sourcemage.org (209.245.211.125), 30 hops max, 40 byte packets
 	 1  192.169.1.1 (192.169.1.1)  3.257 ms  1.050 ms  1.019 ms

diff --git a/SourceMage/Traceroute.mdwn b/SourceMage/Traceroute.mdwn
new file mode 100644
index 0000000..b3ee5d1
--- /dev/null
+++ b/SourceMage/Traceroute.mdwn
@@ -0,0 +1,144 @@
+[[!toc ]]
+----
+#WTF is this?
+Well one day I noticed at work that Time Warner Cable's connection to download.sourcemage.org really sucked. I ended up bouncing all over the freaking place before ending up at the right location. Pretty lame. I wondered what my connection was at home, and put them both up here, just as a comparison. Then others started adding it too. And now it's cool.
+
+#Free
+From lejatorn's home
+	traceroute to download.sourcemage.org (66.101.58.203), 30 hops max, 40 byte packets
+	 1  192.168.0.254 (192.168.0.254)  1.153 ms  1.141 ms  0.869 ms
+	 2  88.166.34.254 (88.166.34.254)  29.448 ms  54.579 ms  28.993 ms
+	 3  * * th2-6k-2-a5.routers.proxad.net (213.228.7.254)  83.733 ms
+	 4  th2-crs16-1-be1000.intf.routers.proxad.net (212.27.57.202)  46.700 ms  29.801 ms  45.882 ms
+	 5  * * te-3-4.car1.Paris1.Level3.net (212.73.207.33)  29.589 ms
+	 6  ge-6-2.core2.Paris1.Level3.net (4.68.109.164)  30.683 ms ge-1-2.core2.Paris1.Level3.net (4.68.109.132)  30.116 ms ge-1-0.core2.Paris1.Level3.net (4.68.109.4)  56.612 ms
+	 7  bcr2-so-3-0-0.Parisprx.savvis.net (212.73.240.202)  46.504 ms  63.494 ms  38.065 ms
+	 8  bcs2-so-2-1-0.Parisprx.savvis.net (204.70.193.142)  49.540 ms  59.492 ms  62.170 ms
+	 9  bcs2-so-3-0-0.Washington.savvis.net (204.70.192.125)  202.532 ms  175.079 ms  174.036 ms
+	10  cr1-tengig-0-15-0-0.Washington.savvis.net (204.70.196.101)  176.736 ms  173.816 ms  256.799 ms
+	11  dcr2-so-7-2-0.Atlanta.savvis.net (204.70.192.57)  228.933 ms  211.886 ms  199.606 ms
+	12  dcr2-so-2-0-0.dallas.savvis.net (204.70.192.70)  173.127 ms  184.761 ms  206.758 ms
+	13  dcr1-so-6-0-0.dallas.savvis.net (204.70.192.49)  349.095 ms  181.763 ms bcr2-so-1-0-0.Dallas.savvis.net (204.70.193.21)  173.854 ms
+	14  bcr2-so-0-0-0.Dallas.savvis.net (204.70.193.13)  180.692 ms atm8-0-0201.CR-1.usdlls.savvis.net (64.240.32.42)  145.678 ms  145.546 ms
+	15  atm8-0-0201.CR-1.usdlls.savvis.net (64.240.32.42)  195.381 ms www.sourcemage.org (66.101.58.203)  145.657 ms atm8-0-0201.CR-1.usdlls.savvis.net (64.240.32.42)  155.895 ms
+
+#Time Warner Cable
+From dkowis' workplace
+	traceroute to download.sourcemage.org (66.101.58.203), 30 hops max, 40 byte packets
+	 1  192.168.2.1 (192.168.2.1)  0.412 ms  0.311 ms  0.229 ms
+	 2  10.44.128.1 (10.44.128.1)  10.957 ms  8.349 ms  9.747 ms
+	 3  gig0-3.snantx3100-ubr1.satx.rr.com (24.28.132.129)  9.957 ms  8.122 ms  8.215 ms
+	 4  gig10-1-1.snantx6000-rtr1.satx.rr.com (24.28.133.144)  12.474 ms  13.104 ms  9.954 ms
+	 5  gig0-0-0.snantx6000-rtr3.texas.rr.com (24.28.129.22)  11.793 ms  11.111 ms  8.987 ms
+	 6  gig2-1-0.dllatxl3-rtr1.texas.rr.com (72.179.205.9)  17.195 ms  20.587 ms  16.220 ms
+	 7  te-9-1.car1.Dallas1.Level3.net (4.79.180.81)  91.305 ms 4.79.180.65 (4.79.180.65)  187.026 ms te-9-2.car1.Dallas1.Level3.net (8.9.232.77)  178.754 ms
+	 8  ae-2-56.bbr2.Dallas1.Level3.net (4.68.122.161)  20.104 ms  23.604 ms ae-2-52.bbr2.Dallas1.Level3.net (4.68.122.33)  27.962 ms
+	 9  as-1-0.bbr2.LosAngeles1.Level3.net (64.159.0.246)  50.595 ms ae-0-0.bbr1.LosAngeles1.Level3.net (64.159.1.125)  49.838 ms as-1-0.bbr2.LosAngeles1.Level3.net (64.159.0.246)  53.078 ms
+	10  ae-12-53.car2.LosAngeles1.Level3.net (4.68.102.77)  54.069 ms ae-12-51.car2.LosAngeles1.Level3.net (4.68.102.13)  51.330 ms ae-12-55.car2.LosAngeles1.Level3.net (4.68.102.141)  51.560 ms
+	11  savvis-level3-10ge.LosAngeles1.Level3.net (4.68.110.94)  53.819 ms  50.834 ms  52.193 ms
+	12  dcr2-ge-3-0-0.losangeles.savvis.net (204.70.193.49)  52.177 ms  142.769 ms  51.934 ms
+	13  dcr1-so-2-0-0.dallas.savvis.net (204.70.192.85)  52.436 ms dcr1-as0-0.LosAngeles.savvis.net (204.70.192.117)  55.821 ms  58.062 ms
+	14  bcr2-so-0-0-0.Dallas.savvis.net (204.70.193.13)  52.185 ms  52.587 ms dcr2-so-3-3-0.dallas.savvis.net (204.70.192.246)  51.929 ms
+	15  bcr2-so-1-0-0.Dallas.savvis.net (204.70.193.21)  52.338 ms  54.321 ms  56.192 ms
+	16  www.sourcemage.org (66.101.58.203)  51.432 ms  51.075 ms atm8-0-0201.CR-1.usdlls.savvis.net (64.240.32.42)  54.183 ms
+
+#Time Warner Telecom
+	traceroute to www.sourcemage.org (66.101.58.203), 30 hops max, 40 byte packets
+	 1  192.168.2.1 (192.168.2.1)  0.298 ms  0.425 ms  0.239 ms
+	 2  207-71-24-129.static.twtelecom.net (207.71.24.129)  2.236 ms  2.430 ms  2.237 ms
+	 3  tran-03-so-2-0-0-0.dlfw.twtelecom.net (66.192.246.49)  9.241 ms  9.455 ms  9.227 ms
+	 4  sl-gw40-fw-3-0.sprintlink.net (160.81.236.225)  9.729 ms  9.676 ms  9.724 ms
+	 5  sl-bb22-fw-4-3.sprintlink.net (144.232.8.249)  10.232 ms  9.953 ms  9.733 ms
+	 6  sl-bb27-fw-12-0.sprintlink.net (144.232.11.33)  10.231 ms  10.180 ms  9.731 ms
+	 7  sl-st20-dal-1-0.sprintlink.net (144.232.9.136)  11.233 ms  11.202 ms  10.979 ms
+	 8  sl-internap-93948-0.sprintlink.net (144.228.250.126)  138.355 ms  65.403 ms  200.597 ms
+	 9  border1.ge4-1-bbnet2.ext1a.dal.pnap.net (216.52.191.84)  15.961 ms  15.179 ms  14.714 ms
+	10  appserve-2.border2.ext1a.dal.pnap.net (216.52.189.82)  15.971 ms  16.181 ms  15.477 ms
+	11  www.sourcemage.org (66.101.58.203)  16.746 ms  15.439 ms  15.713 ms
+
+#AT&T
+From dkowis' home
+	traceroute to download.sourcemage.org (66.101.58.203), 30 hops max, 40 byte packets
+	 1  moebius (10.10.220.254)  0.203 ms  0.237 ms  0.189 ms
+	 2  192.0.2.100 (192.0.2.100)  2.398 ms  2.726 ms  2.536 ms
+	 3  dist2-vlan50.snantx.sbcglobal.net (151.164.17.131)  2.940 ms  2.752 ms  2.591 ms
+	 4  bb1-g1-3-0.snantx.sbcglobal.net (151.164.17.230)  2.971 ms  2.745 ms  2.737 ms
+	 5  ex1-p12-0.eqdltx.sbcglobal.net (151.164.40.29)  11.298 ms  13.179 ms  10.856 ms
+	 6  151.164.249.222 (151.164.249.222)  43.222 ms  43.726 ms  43.058 ms
+	 7  dpr1-ge-2-2-1.dallasequinix.savvis.net (204.70.194.29)  41.290 ms  41.400 ms  41.311 ms
+	 8  dcr2-so-7-2-0.Dallas.savvis.net (204.70.193.214)  40.883 ms dcr1-ge-7-0-0.dallas.savvis.net (204.70.196.29)  42.904 ms dcr2-so-5-0-0.dallas.savvis.net (204.70.194.157)  43.277 ms
+	 9  bcr2-so-1-0-0.Dallas.savvis.net (204.70.193.21)  41.356 ms  41.149 ms  42.256 ms
+	10  atm8-0-0201.CR-1.usdlls.savvis.net (64.240.32.42)  12.408 ms  12.175 ms  12.146 ms
+	11  www.sourcemage.org (66.101.58.203)  12.649 ms  12.873 ms  13.006 ms
+
+#PRTC
+From ryuji's home in Puerto Rico
+	traceroute to download.sourcemage.org (66.101.58.203), 30 hops max, 40 byte packets
+	 1  poseidon.dragonboricua.com (64.237.215.8)  1 ms  1 ms  1 ms
+	 2  196-28-53-94.prtc.net (196.28.53.94)  11.561 ms  26.203 ms  11.678 ms
+	 3  66.50.255.169 (66.50.255.169)  12.748 ms  11.763 ms  11.485 ms
+	 4  66.50.242.226 (66.50.242.226)  12.597 ms  11.567 ms  12.156 ms
+	 5  66-50-63-254.prtc.net (66.50.63.254)  12.352 ms  11.653 ms  12.144 ms
+	 6  63.245.44.45 (63.245.44.45)  37.640 ms  38.519 ms  37.659 ms
+	 7  sl-st20-mia-14-3.sprintlink.net (144.223.64.153)  61.924 ms  61.603 ms  62.905 ms
+	 8  sl-bb21-mia-12-0-0.sprintlink.net (144.232.2.196)  62.599 ms  60.680 ms  60.228 ms
+	 9  sl-bb22-orl-9-0.sprintlink.net (144.232.19.171)  62.800 ms  68.373 ms  62.771 ms
+	10  sl-crs1-atl-0-0-0-3.sprintlink.net (144.232.12.20)  58.799 ms  60.306 ms  58.793 ms
+	11  sl-crs1-fw-0-12-0-0.sprintlink.net (144.232.11.146)  74.639 ms  73.981 ms  75.377 ms
+	12  sl-st20-dal-12-0-0.sprintlink.net (144.232.9.193)  75.536 ms  80.437 ms  74.552 ms
+	13  144.228.250.114 (144.228.250.114)  233.050 ms  151.165 ms  230.998 ms
+	14  border1.ge4-1-bbnet2.ext1a.dal.pnap.net (216.52.191.84)  73.673 ms  74.308 ms  74.567 ms
+	15  sprocketdata-2.border2.ext1a.dal.pnap.net (216.52.189.82)  75.328 ms  74.348 ms  73.975 ms
+	16  www.sourcemage.org (66.101.58.203)  80.905 ms  80.498 ms  74.918 ms
+
+#German Telekom
+From alley_cats alley in Germany.
+	traceroute to download.sourcemage.org (66.101.58.203), 30 hops max, 40 byte packets
+	 1  * * *
+	 2  217.0.74.198 (217.0.74.198)  45.071 ms  40.150 ms  40.708 ms
+	 3  194.25.6.193 (194.25.6.193)  59.362 ms  55.849 ms  65.853 ms
+	 4  s263240-1.bcr1-lnx.savvis.net (206.24.169.5)  64.877 ms  66.623 ms  58.103 ms
+	 5  bcs2-so-0-0-0.NewYork.savvis.net (204.70.192.121)  124.748 ms  123.698 ms  123.895 ms
+	 6  bcs1-so-6-0-0.NewYork.savvis.net (204.70.192.37)  153.867 ms  123.886 ms  123.799 ms
+	 7  dcr2-so-3-0-0.Chicago.savvis.net (204.70.192.101)  148.201 ms  151.195 ms  146.564 ms
+	 8  dcr2-so-0-0-0.dallas.savvis.net (204.70.192.98)  221.790 ms  198.795 ms  198.861 ms
+	 9  bcr2-so-1-0-0.Dallas.savvis.net (204.70.193.21)  198.867 ms  200.568 ms dcr1-so-6-0-0.dallas.savvis.net (204.70.192.49)  199.863 ms
+	10  atm8-0-0201.CR-1.usdlls.savvis.net (64.240.32.42)  199.815 ms bcr2-so-0-0-0.Dallas.savvis.net (204.70.193.13)  199.805 ms  203.851 ms
+	11  www.sourcemage.org (66.101.58.203)  201.627 ms atm8-0-0201.CR-1.usdlls.savvis.net (64.240.32.42)  199.810 ms www.sourcemage.org (66.101.58.203)  202.774 ms
+
+#SuddenLink
+From Maffoo``Clock's home in San Angelo, TX
+	traceroute to download.sourcemage.org (209.245.211.125), 30 hops max, 40 byte packets
+	 1  10.248.208.1 (10.248.208.1)  6.874 ms  17.561 ms  7.952 ms
+	 2  cdm-66-76-46-165.susp.suddenlink.net (66.76.46.165)  9.449 ms  6.579 ms  8.220 ms
+	 3  cdm-66-76-46-153.susp.suddenlink.net (66.76.46.153)  16.420 ms  54.821 ms  17.061 ms
+	 4  cdm-66-76-31-69.lfkn.suddenlink.net (66.76.31.69)  29.672 ms  31.908 ms  31.628 ms
+	 5  pvt-172-31-255-254.tyrd.suddenlink.net (172.31.255.254)  36.608 ms  32.560 ms  37.249 ms
+	 6  * * *
+	 7  ae-1-55.bbr1.Dallas1.Level3.net (4.68.122.129)  35.485 ms  34.758 ms ae-1-53.bbr1.Dallas1.Level3.net (4.68.122.65)  34.620 ms
+	 8  so-1-0-0.mp1.Houston1.Level3.net (209.247.11.169)  40.377 ms ge-7-0-0.mp2.Houston1.Level3.net (209.247.11.166)  39.503 ms so-1-0-0.mp1.houston1.level3.net (209.247.11.169)  40.498 ms
+	 9  so-10-0.hsa1.Houston1.Level3.net (4.68.112.142)  39.859 ms  43.742 ms  45.583 ms
+	10  DBG-PARTNER.hsa1.Level3.net (209.245.208.74)  37.794 ms  36.534 ms  35.566 ms
+	11  209.245.211.125 (209.245.211.125)  39.534 ms  39.061 ms  40.415 ms
+
+#Flux Control's lazy VERIZON butt
+	flux@shaolin:~$ traceroute -I download.sourcemage.org
+	traceroute to download.sourcemage.org (209.245.211.125), 30 hops max, 40 byte packets
+	 1  192.169.1.1 (192.169.1.1)  3.257 ms  1.050 ms  1.019 ms
+	 2  wudan (192.168.1.1)  2.305 ms  1.814 ms  1.751 ms
+	 3  10.41.13.1 (10.41.13.1)  24.328 ms  23.671 ms  24.209 ms
+	 4  130.81.33.242 (130.81.33.242)  23.147 ms  39.459 ms  23.387 ms
+	 5  P15-3.LCR-02.NRFLVA.verizon-gni.net (130.81.28.30)  33.610 ms  33.429 ms  33.022 ms
+	 6  0.so-5-0-0.XL2.EWR6.ALTER.NET (152.63.20.13)  42.744 ms  43.070 ms  42.976 ms
+	 7  0.so-6-1-0.XL4.NYC4.ALTER.NET (152.63.16.198)  43.620 ms  43.643 ms  43.654 ms
+	 8  0.ge-7-0-0.BR3.NYC4.ALTER.NET (152.63.18.9)  40.609 ms  40.809 ms  40.461 ms
+	 9  204.255.173.54 (204.255.173.54)  84.224 ms  43.524 ms  43.172 ms
+	10  ge-1-3-0-79.bbr2.NewYork1.Level3.net (4.68.16.66)  62.096 ms  41.819 ms  41.622 ms
+	11  ge-7-0-0.mp1.Houston1.Level3.net (209.247.11.165)  88.707 ms  89.004 ms so-1-0-0.mp2.Houston1.Level3.net
+						 (4.68.144.10)  88.934 ms
+	12  so-10-0.hsa1.Houston1.Level3.net (4.68.112.142)  90.087 ms  89.270 ms so-11-0.hsa1.Houston1.Level3.net
+						 (4.68.96.58)  90.541 ms
+	13  DBG-PARTNER.hsa1.Level3.net (209.245.208.74)  90.032 ms  87.535 ms  87.946 ms
+	14  muninn.sourcemage.org (209.245.211.125)  90.047 ms  88.358 ms  89.388 ms
+
+[[!taglink SourceMage]]

diff --git a/SourceMage/CPANPLUS.mdwn b/SourceMage/CPANPLUS.mdwn
index d5bb467..7e7d561 100644
--- a/SourceMage/CPANPLUS.mdwn
+++ b/SourceMage/CPANPLUS.mdwn
@@ -2,7 +2,8 @@
 Well, kinda. The idea is to build it so that you don't need to spellify the entire perl-cpan repo. Just cast something that's perl and it just works. Perhaps match on any `perl-cpan-$spell`
 
 ##notes
-	<afrayedknot> in anycase, you'd need to be able to find the name of every module cpan+ installs, along w/ the files it installs, plus the dependencies it pulls in
+	<afrayedknot> in anycase, you'd need to be able to find the name of every module cpan+ installs,
+	along w/ the files it installs, plus the dependencies it pulls in
 
 ###URLs
  * <http://search.cpan.org/~kane/CPANPLUS-0.84/lib/CPANPLUS/Backend.pm>

diff --git a/SourceMage/CPANPLUS.mdwn b/SourceMage/CPANPLUS.mdwn
new file mode 100644
index 0000000..d5bb467
--- /dev/null
+++ b/SourceMage/CPANPLUS.mdwn
@@ -0,0 +1,12 @@
+#Integrating CPANPLUS into Sorcery
+Well, kinda. The idea is to build it so that you don't need to spellify the entire perl-cpan repo. Just cast something that's perl and it just works. Perhaps match on any `perl-cpan-$spell`
+
+##notes
+	<afrayedknot> in anycase, you'd need to be able to find the name of every module cpan+ installs, along w/ the files it installs, plus the dependencies it pulls in
+
+###URLs
+ * <http://search.cpan.org/~kane/CPANPLUS-0.84/lib/CPANPLUS/Backend.pm>
+ * <http://search.cpan.org/~kane/CPANPLUS-0.84/lib/CPANPLUS/Module.pm>
+ * <http://search.cpan.org/~kane/CPANPLUS-0.84/lib/CPANPLUS.pm#API_REFERENCE>
+
+[[!taglink SourceMage]]

diff --git a/SourceMage/Initng/SpellList.mdwn b/SourceMage/Initng/SpellList.mdwn
new file mode 100644
index 0000000..2419e4a
--- /dev/null
+++ b/SourceMage/Initng/SpellList.mdwn
@@ -0,0 +1,247 @@
+Here's the list of all the spells that need to be worked on
+[[!table  data="""
+Spell|Tested|New Script
+acpi-support| | X
+acpid| |
+agt| |
+alsa-lib| |
+amavisd-new| |
+anubis| |
+apache| |
+apache-mod_ssl| |
+apache2| |
+apache22| |
+apmd| |
+arpwatch| |
+asterisk| |
+at| |
+athcool| |
+autofs| |
+bacula| |
+bayonne2| |
+bfilter| |
+bind| |
+bluez-utils| |
+bnbt| |
+boinc| |
+canna| |
+cdemu-daemon| |
+cherokee| |
+chpax| |
+chrony| |
+clamav| |
+coda-client| |
+coda-server| |
+console-tools| |
+courier| |
+courier-authlib| |
+courier-imap| |
+cpqarrayd| |
+cpufreqd| |
+cups| |
+cups-old| |
+cvsfs| |
+cyrus-imapd| |
+cyrus-sasl| |
+dansguardian| |
+dante| |
+dbus| |
+dcron| |
+ddclient| |
+denyhosts| |
+dermixd| |
+deskopt| |
+devfsd| |
+dhcdbd| |
+dhcp| |
+dictd| |
+distcc| |
+dnsmasq| |
+dovecot| |
+drac| |
+dropbear| |
+dspam| |
+entrance| |
+esehttpd| |
+exim| |
+fail2ban| |
+fam| |
+farmerjoe| |
+fcron| |
+ferm| |
+firebird| |
+fnfx| |
+freeradius| |
+freewnn| |
+fwknop| |
+g15daemon| |
+gdm| |
+gdm2| |
+git| |
+gkrellm2| |
+gnump3d| |
+gnustep-base| |
+gpm| |
+hal| |
+havp| |
+hc-cron| |
+hdparm| |
+hibernate-script| |
+hotplug| |
+httpd-dev| |
+ifplugd| |
+ifupdown| |
+ijb| |
+ijb-waldhoff| |
+infinity| |
+init.d| |
+initng| |
+initng-ifiles| |
+initng.gpg| |
+initools| |
+ipcad| |
+iplog| |
+irda-utils| |
+ivman| |
+jabberd| |
+kbd| |
+kdebase| |
+kdebase-workspace4| |
+keepalived| |
+krb5| |
+lamp| |
+laptop-mode-tools| |
+lcdproc| |
+libnetswitch| |
+lighttpd| |
+linux| |
+linux-initramfs| |
+linux-initrd| |
+linux-wlan-ng| |
+lisa| |
+lm_sensors| |
+logitech_applet| |
+logs| |
+lsh| |
+lshwd| |
+mailman| |
+maradns| |
+mcron| |
+metalog| |
+mico| |
+microcode_ctl| |
+middleman| |
+module-init-tools| |
+modutils| |
+mono| |
+mpd| |
+mysql| |
+mythtv| |
+nagios| |
+nas| |
+nessus-core| |
+netatalk| |
+netkit-bootparamd| |
+netkit-inetd| |
+newsd| |
+nfs-utils| |
+noip| |
+nrpe| |
+ntop| |
+ntp| |
+nufw| |
+oidentd| |
+omniorb| |
+openldap| |
+openmosix-tools| |
+openmosixview| |
+openntpd| |
+openssh| X |
+openswan| |
+openvpn| |
+palantir| |
+pbbuttonsd| |
+pcmcia-cs| |
+pglogd| |
+pikt| |
+pks| |
+plptools| |
+popfile| |
+poptop| |
+portmap| |
+portsentry| |
+postfix| |
+postgresql| |
+powersave| |
+privoxy| |
+prngd| |
+procps| |
+proftpd| |
+pump| |
+pure-ftpd| |
+qingy| |
+queue| |
+quota| |
+radvd| |
+refs| |
+resin| |
+rng-tools| |
+rplay| |
+rtirq| |
+samba| |
+scanlogd| |
+scim| |
+sendmail| |

(Diff truncated)

diff --git a/SourceMage/Initng.mdwn b/SourceMage/Initng.mdwn
index d4b802f..07f7575 100644
--- a/SourceMage/Initng.mdwn
+++ b/SourceMage/Initng.mdwn
@@ -65,7 +65,7 @@ Except it doesn't... initng isn't waiting on this to complete, so system/mountro
 Putting a sleep 2 in the mountroot/check `start_script` makes it all happy. Delays my startup time some, but it boots.
 
 ##halt and reboot
-The existing halt and reboot don't work. You will have to do some fancy symlinking: http://www.initng.org/ticket/20 .
+The existing halt and reboot don't work. You will have to do some fancy symlinking: <http://www.initng.org/ticket/20> .
 It's pretty simple. Symlink nghalt to halt, and ngreboot to reboot. Then it should work.
 
 #Upgrade Path
@@ -77,7 +77,7 @@ It's pretty simple. Symlink nghalt to halt, and ngreboot to reboot. Then it shou
 1. dispel simpleinit-msb
 
 #Now whut?
-Well, that will get you a bootable minimal system. I guess now the plan needs to involve replacing existing init scripts with initng friendly ones. Also they use /etc/conf.d instead of /etc/sysconfig. I'll have to fix all the spells that have stuff like that. I've filed a bug: http://www.initng.org/ticket/822 Hopefully something will be done about this. The initng guys seem to be good about it. Now I guess I need to go through every spell that has an initscript and update it to work with initng.
+Well, that will get you a bootable minimal system. I guess now the plan needs to involve replacing existing init scripts with initng friendly ones. Also they use /etc/conf.d instead of /etc/sysconfig. I'll have to fix all the spells that have stuff like that. I've filed a bug: <http://www.initng.org/ticket/822> Hopefully something will be done about this. The initng guys seem to be good about it. Now I guess I need to go through every spell that has an initscript and update it to work with initng.
 
 ##TODO
 1. Modify the `default_install` to handle an `initng` dir that will contain a `script.i` and optionally a `script`

diff --git a/SourceMage/Initng.mdwn b/SourceMage/Initng.mdwn
new file mode 100644
index 0000000..d4b802f
--- /dev/null
+++ b/SourceMage/Initng.mdwn
@@ -0,0 +1,87 @@
+[[!toc ]]
+#Whut?
+Plans for converting Source Mage GNU/Linux to use initng, rather than simpleinit-msb. Simpleinit-msb isn't maintained anymore, and it's got a few flaws. A rewriting of our init system probably wouldn't be a bad thing to do.
+
+#How
+This is still in flux:
+1. Branch the grimoire in git locally (publish it)
+1. Branch Sorcery to remove init script installation stuffs
+1. In grimoire branch, write logic to install init scripts
+1. Replace existing init scripts with initng compatible ones
+ * Continue to pull from the main grimoire to keep it up to date, just changing init scripts
+ * use this grimoire in a test VM to make sure it all works
+ * use the scripts existing in initng-ifiles
+
+#Gotchas
+##Killall ?!?
+Fix file initng is using killall somewhere in there in response to an excessive oddity that fedora introduced. Should be fixed in the next release.
+	edit /etc/initng/system/udev.i and place the killall line with kill -HUP 1 (uses the bash builtin, safest method)
+
+##system/clock.i
+Apparently, their script assumes that hwclock never fails.. Well it does in xen. So you have to add an ` exit 0 ` to the end of the start method.
+
+##system/agetty/1
+If you want a getty on tty1 you need to ng-update add system/agetty/1
+
+##loop back interface (FIXED)
+Apparently their network script uses ifup. Source Mage by default doesn't install any config for a loopback interface. The defaults configure it correctly. But ` ifup lo ` doesn't work, because there's no lo configuration file.
+
+This branched off into SourceMageIfupdown (DONE!). Gotta finish that first, before I can keep moving on initng.
+
+##Quiet startup?
+pass `quiet_when_up` to initng to have it not talk all over tty1
+
+##Official instructions
+"Please remove the references to /dev/shm and /dev/pts in your /etc/fstab, e. g. by commenting them out. "
+
+##Udev EXPLOSION
+I don't really know wtf is going on here. initng seems to be really strangely tailored, or SMGL's initng setup is all sorts of borked...
+
+You have to edit the /etc/initng/system/udev.i and change `$tmpfs_size` to like 10M or some other size...
+Actually, you have to comment out the lines that do the checking for tmpfs. It doesn't cooperate and I'm not really sure why. So I'm going to drop the f-bomb on it...)-- Well, it really needs tmpfs. So make DAMN SURE THAT YOU CAN MOUNT THIS:
+
+	mount udev /mnt/tmpfs -o size=10M,mode=0755 -t tmpfs
+
+If that doesn't work, you won't be booting any initng....
+
+###WTF?!?!?
+Apparently, my kernel didn't have tmpfs built in, even though it showed up in /proc/filesystems. That's rather scary. So go check your kernel config before doing this and ensure that you've got tmpfs support built in...
+
+###Fix the /etc/initng/system/udev.i
+One has to apply l33t hax to the filldev event.
+Set this up before the first if in filldev. Right after they talk about trying to do this stuff.
+
+	if [ -x "/sbin/udevadm" ]
+	then
+	  /sbin/udevadm trigger
+	  echo "Waiting for /dev to be fully ppulated ..."
+	  /sbin/udevadm settle
+	elif
+
+Now udev should work.
+
+Except it doesn't... initng isn't waiting on this to complete, so system/mountroot/check fails horribly, because it can't find /dev/hda2. By the time you get a login prompt, you can find /dev/hda2. Something is really stupid. I've asked on #initng as to why it's not waiting as it should :/
+
+Putting a sleep 2 in the mountroot/check `start_script` makes it all happy. Delays my startup time some, but it boots.
+
+##halt and reboot
+The existing halt and reboot don't work. You will have to do some fancy symlinking: http://www.initng.org/ticket/20 .
+It's pretty simple. Symlink nghalt to halt, and ngreboot to reboot. Then it should work.
+
+#Upgrade Path
+1. Install initng and initng-ifiles
+1. run genrunlevel --all
+1. fix gotchas
+1. rebewt
+1. Read documentation on how to actually use initng
+1. dispel simpleinit-msb
+
+#Now whut?
+Well, that will get you a bootable minimal system. I guess now the plan needs to involve replacing existing init scripts with initng friendly ones. Also they use /etc/conf.d instead of /etc/sysconfig. I'll have to fix all the spells that have stuff like that. I've filed a bug: http://www.initng.org/ticket/822 Hopefully something will be done about this. The initng guys seem to be good about it. Now I guess I need to go through every spell that has an initscript and update it to work with initng.
+
+##TODO
+1. Modify the `default_install` to handle an `initng` dir that will contain a `script.i` and optionally a `script`
+ * The `script.i` is the actual init script
+ * The `script` file is the /etc/conf.d stuff
+1. Start [[going through spells|Initng/SpellList]], alphabetically, I guess, and add to them initng scripts, or double check the correctness of the existing initng scripts.
+

diff --git a/SourceMage/MythUpdater.mdwn b/SourceMage/MythUpdater.mdwn
index 1598a49..4da00c7 100644
--- a/SourceMage/MythUpdater.mdwn
+++ b/SourceMage/MythUpdater.mdwn
@@ -1,5 +1,5 @@
 I once wrote a script to update all the Myth* Spells at once:
 
-	[[!inline pagenames="SourceMage/MythUpdater/mythupdater.sh" raw="yes" rss="no" atom="no"]]
+[[!inline pagenames="mythupdater.sh"  rss="no" atom="no"]]
 
 [[!taglink SourceMage]]

diff --git a/SourceMage/MythUpdater.mdwn b/SourceMage/MythUpdater.mdwn
index fa28fb5..1598a49 100644
--- a/SourceMage/MythUpdater.mdwn
+++ b/SourceMage/MythUpdater.mdwn
@@ -1,5 +1,5 @@
 I once wrote a script to update all the Myth* Spells at once:
 
-	[[!inline pagenames="mythupdater.sh" raw="yes" rss="no" atom="no"]]
+	[[!inline pagenames="SourceMage/MythUpdater/mythupdater.sh" raw="yes" rss="no" atom="no"]]
 
 [[!taglink SourceMage]]

diff --git a/SourceMage/MythUpdater.mdwn b/SourceMage/MythUpdater.mdwn
index 332d2cb..fa28fb5 100644
--- a/SourceMage/MythUpdater.mdwn
+++ b/SourceMage/MythUpdater.mdwn
@@ -1,5 +1,5 @@
 I once wrote a script to update all the Myth* Spells at once:
 
-[[!inline pages="mythupdater.sh" raw="yes" ]]
+	[[!inline pagenames="mythupdater.sh" raw="yes" rss="no" atom="no"]]
 
 [[!taglink SourceMage]]

diff --git a/SourceMage/MythUpdater.mdwn b/SourceMage/MythUpdater.mdwn
index 3d8b4b6..332d2cb 100644
--- a/SourceMage/MythUpdater.mdwn
+++ b/SourceMage/MythUpdater.mdwn
@@ -1,5 +1,5 @@
 I once wrote a script to update all the Myth* Spells at once:
 
-[[!inline pages="mythupdater.sh" rootpage="MythUpdater" raw="yes" ]]
+[[!inline pages="mythupdater.sh" raw="yes" ]]
 
 [[!taglink SourceMage]]