Merge branch 'maint'

Conflicts:
	host/docs/usrp_e3x0.dox

1 files changed, 0 insertions, 34 deletions

diff --git a/host/docs/general.dox b/host/docs/general.dox
index 1da284057..e4ffcfb6e 100644
--- a/host/docs/general.dox
+++ b/host/docs/general.dox
@@ -78,40 +78,6 @@ second).
     usrp->issue_stream_command(...);
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-\section general_subdev Specifying the Subdevice to Use
-
-A subdevice specification string for USRP family devices is composed of:
-
-    <motherboard slot name>:<daughterboard frontend name>
-
-Ex: The subdev spec markup string to select a WBX on slot B.
-
-    B:0
-
-Ex: The subdev spec markup string to select a BasicRX on slot B.
-
-    B:AB
-
-    -- OR --
-
-    B:A
-
-    -- OR --
-
-    B:B
-
-\subsection general_subdev_slotnames USRP Family Motherboard Slot Names
-
-All USRP family motherboards have a first slot named **A:**. The USRP1, the X3x0
-and the B210 have two daughterboard subdevice slots, known as **A:** and **B:**.
-
-\subsection general_subdev_dbnames Daughterboard Frontend Names
-
-Daughterboard frontend names can be used to specify which signal path is
-used from a daughterboard. Most daughterboards have only one frontend **:0**.
-A few daughterboards (Basic, LF and TVRX2) have multiple
-frontend names available. The frontend names are documented in \ref page_dboards.
-
 \section general_ounotes Overflow/Underflow Notes
 
 <b>Note:</b> The following overflow/underflow notes do not apply to USRP1,