Penguin

Differences between current version and previous revision of ScottWalsh.

Other diffs: Previous Major Revision, Previous Author, or view the Annotated Edit History

Newer page: version 10 Last edited on Wednesday, October 10, 2007 1:47:32 am by ScottWalsh
Older page: version 9 Last edited on Wednesday, October 10, 2007 1:46:16 am by ScottWalsh Revert
@@ -6,19 +6,11 @@
 Presented at [NZNOG] '06 on [firewall segregation/virtualisation|http://www.nznog.org/node/11] and the have a [pdf|http://resources.nznog.org/Thursday-230306/ScottWalsh-NetworkSecurityThroughFirewallSegregation/NZNOG06%20Firewall%20Virtualization%20-%20Scott%20Walsh%20IBM%20NZ.pdf] of the presentantion online. Due to work comments at the time, wasn't able to make it to the 2007 NZNOG... 
  
 IANA but have written a paper on [New Zealand Information Technology Security Legislation|http://www.giac.org/certified_professionals/practicals/gsec/4001.php] for GSEC. 
  
-<<<<<<< Your version  
- My personal website([zone3|http://zone3.net.nz/]) is far more travel related than Linux... although that may change in time. 
+My personal website([zone3.net.nz |http://zone3.net.nz/]) is far more travel related than Linux... although that may change in time. 
  
-  
- Run a nice little PVR box at home based on MythTv  
-=======  
-My personal website([zone3|http://zone3 .net .nz/]) is far more travel related than Linux ... although that may change in time.  
-  
-  
-Run a nice little PVR box at home based on MythTV  
->>>>>>> Other version  
+Run a nice little PVR box at home based on MythTv... 
  
 <?plugin WlugLicenseAgreement ?> 
 ---- 
 CategoryHomePage