Index: /tools/gformat.py
===================================================================
--- /tools/gformat.py	(revision 10879)
+++ /tools/gformat.py	(revision 10880)
@@ -424,5 +424,5 @@
     if not datadump[iface_key].has_key('comment'):
       datadump[iface_key]['comment'] = None
-    dhcp_out[ifname].append("  ## %(interface)s - %(desc)s - %(comment)s\n" % datadump[iface_key])
+    dhcp_out[ifname].append("  ## %(interface)s - %(comment)s\n" % datadump[iface_key])
 
     (addr, mask) = datadump[iface_key]['ip'].split('/')
@@ -473,5 +473,5 @@
     if not datadump[iface_key].has_key('comment'):
       datadump[iface_key]['comment'] = None
-    output += "## %(interface)s - %(desc)s - %(comment)s\n" % datadump[iface_key]
+    output += "## %(interface)s - %(comment)s\n" % datadump[iface_key]
 
     try:
@@ -679,5 +679,5 @@
 
     # Add interface IP to list
-    item = (ifacedump['ip'], ifacedump['desc'])
+    item = (ifacedump['ip'], ifacedump['comment'])
     if addrs_list.has_key(ifname):
       addrs_list[ifname].append(item)
@@ -930,5 +930,5 @@
   output += "\n\n"
 
-  key_order = [ 'comment', 'interface', 'ip', 'desc', 'sdesc', 'mode', 'type',
+  key_order = [ 'comment', 'interface', 'ip', 'sdesc', 'mode', 'type',
     'extra_type', 'channel', 'ssid', 'dhcp' ]
 
@@ -1467,6 +1467,6 @@
           if datadump[iface_key].has_key('ns_ip') and not datadump[iface_key].has_key('mode'):
             datadump[iface_key]['mode'] = 'autogen-FIXME'
-          if not datadump[iface_key].has_key('desc'):
-            datadump[iface_key]['desc'] = 'autogen-FIXME'
+          if not datadump[iface_key].has_key('comment'):
+            datadump[iface_key]['comment'] = 'autogen-FIXME'
           # Set the compass value based on the angle between the poels
           if datadump[iface_key].has_key('ns_ip'):