Merge "Add back CAPWAP to bk-developers-guide.adoc"

diff --combined manuals/developer-guide/src/main/asciidoc/bk-developers-guide.adoc
index 81b98fd03afbfd8df81c8b4ae4758aaff5cff1ef,1afb8b87690785123e6f2a969791b10bfe1af445..1aae30cec19bd64132884853e6cfda0b2c03e764
--- 1/manuals/developer-guide/src/main/asciidoc/bk-developers-guide.adoc
--- 2/manuals/developer-guide/src/main/asciidoc/bk-developers-guide.adoc
+++ b/manuals/developer-guide/src/main/asciidoc/bk-developers-guide.adoc
@@@ -36,14 -36,6 +36,14 @@@ the end of their file
  //////////////////////////
  = Overview
  
 +// FIXME: Should we use introduction from user manual / installation guide?
 +//        are this prerequisites for developers guide? If so, we should document
 +//        that explicitly here so we do not need to repeat same text
 +//          over-and-over
 +
 +// FIXME: section_Git_and_Gerrit_Setup.adoc and section_Hacking_from_CLI.adoc
 +//        is much more contributor style documentation and not Developer
 +//        documentation for folks which wants to build on top of OpenDaylight. 
  include::section_Git_and_Gerrit_Setup.adoc[]
  
  include::section_Hacking_from_CLI.adoc[]
@@@ -56,24 -48,20 +56,26 @@@ include::bgpcep/odl-bgpcep-bgp-all-dev.
  
  include::bgpcep/odl-bgpcep-pcep-all-dev.adoc[PCEP]
  
+ include::capwap/capwap-dev.adoc[CAPWAP]
+ 
  include::iotdm/iotdm-dev.adoc[]
  
  include::lacp/lacp-dev.adoc[]
  
  include::l2switch/l2switch-dev.adoc[]
  
 -include::nic/nic-model-dev.adoc[]
 +include::nic/nic-dev.adoc[]
  
  include::neutron/neutron.adoc[]
  
  include::openflowjava/odl-openflowjava-protocol-dev.adoc[]
  
 +include::opflex/libopflex-dev.adoc[]
 +
 +include::opflex/genie-dev.adoc[]
 +
 +include::opflex/agent-ovs-dev.adoc[]
 +
  include::ovsdb/ovsdb-developer.adoc[]
  
  include::reservation/reservation-dev.adoc[]
@@@ -90,12 -78,8 +92,12 @@@ include::ttp/ttp-model-dev.adoc[
  
  include::ttp/ttp-cli-tools-dev.adoc[]
  
 +include::usc/odl-usc-channel-dev.adoc[]
 +
  include::didm/didm-dev.adoc[]
  
 +include::vtn/vtn-dev.adoc[]
 +
  :numbered!:
  
  ///////