From e505e0a2759bb4d9c7766a643e89b7798d5f9cb8 Mon Sep 17 00:00:00 2001
From: ahrenholz <ahrenholz@286e914e-1314-11de-a46f-cd5bcf99231e>
Date: Mon, 25 Oct 2010 17:04:14 +0000
Subject: [PATCH] added MILCOM 2010 publication

---
 wiki/FAQ.wiki | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/wiki/FAQ.wiki b/wiki/FAQ.wiki
index d07ff1a1..3bd74134 100644
--- a/wiki/FAQ.wiki
+++ b/wiki/FAQ.wiki
@@ -16,6 +16,12 @@ CORE is open source software, licensed under the [http://en.wikipedia.org/wiki/B
 
 == 4. Are there any technical publications about CORE? ==
 
+A comparison of the CORE FreeBSD, OpenVZ, and netns platforms was published in the IEEE MILCOM 2010 Conference:
+
+Comparison of CORE Network Emulation Platforms<br>
+by: Jeff Ahrenholz<br>
+Military Communications Conference, 2010. MILCOM 2010. IEEE (2010), pp. 1-6
+
 An overview of CORE was published in the IEEE MILCOM 2008 Conference:
 
 CORE: A real-time network emulator<br>