Merge into master from pull request #81:

Fix Javadoc comments (https://github.com/floodlight/floodlight/pull/81)

src/main/java/net/floodlightcontroller/devicemanager/internal/DeviceManagerImpl.java

@@ -499,7 +499,7 @@ public class DeviceManagerImpl implements IDeviceManagerService, IOFMessageListe
 
         /**
          * Delete an attachment point from a device
-         * @param d the device
+         * @param dlAddr the data link layer's address of the device
          * @param swPort the {@link SwitchPortTuple} to remove
          */
         protected void delDevAttachmentPoint(long dlAddr, SwitchPortTuple swPort) {
@@ -580,7 +580,7 @@ public class DeviceManagerImpl implements IDeviceManagerService, IOFMessageListe
         /**
          * Add switch-port to port_channel mapping to portChannelMap
          * @param switch_id
-         * @param port_no
+         * @param port_name
          * @param port_channel
          */
         protected void addPortToPortChannel(String switch_id,
@@ -1334,7 +1334,7 @@ public class DeviceManagerImpl implements IDeviceManagerService, IOFMessageListe
     }
     
     /**
-     * @param topology the topology to set
+     * @param linkDiscovery the link discovery service to set
      */
     public void setLinkDiscovery(ILinkDiscoveryService linkDiscovery) {
         this.linkDiscovery = linkDiscovery;