Merge branch 'master' into ashish/gpio_atr_redux

4 files changed, 3 insertions, 15 deletions

diff --git a/host/docs/Doxyfile.in b/host/docs/Doxyfile.in
index dc4966011..d984b6f6b 100644
--- a/host/docs/Doxyfile.in
+++ b/host/docs/Doxyfile.in
@@ -1472,18 +1472,6 @@ GENERATE_XML           = NO
 
 XML_OUTPUT             = xml
 
-# The XML_SCHEMA tag can be used to specify an XML schema,
-# which can be used by a validating XML parser to check the
-# syntax of the XML files.
-
-XML_SCHEMA             =
-
-# The XML_DTD tag can be used to specify an XML DTD,
-# which can be used by a validating XML parser to check the
-# syntax of the XML files.
-
-XML_DTD                =
-
 # If the XML_PROGRAMLISTING tag is set to YES Doxygen will
 # dump the program listings (including syntax highlighting
 # and cross-referencing information) to the XML output. Note that
diff --git a/host/docs/dboards.dox b/host/docs/dboards.dox
index 812a3a09e..a0188b25c 100644
--- a/host/docs/dboards.dox
+++ b/host/docs/dboards.dox
@@ -395,7 +395,7 @@ below, and to the left of **R193**. The silkscreen for **R193** is ok,
 but for **R194**, it is upside down, and partially cut off. If you lose
 **R193**, you can use anything from 0 to 10 Ohms there.
 
-\subsubsection dboards_dbsrxmod_1 Step 2: Burn a new daughterboard id into the EEPROM
+\subsubsection dboards_dbsrxmod_2 Step 2: Burn a new daughterboard id into the EEPROM
 
 With the daughterboard plugged-in, run the following commands:
 
diff --git a/host/docs/usrp_e3x0.dox b/host/docs/usrp_e3x0.dox
index 3c206195d..d49310c2c 100644
--- a/host/docs/usrp_e3x0.dox
+++ b/host/docs/usrp_e3x0.dox
@@ -215,7 +215,7 @@ again by:
 In order to upgrade or reinitialize a sd card for the first time, you can use the 'dd' tool.
 Make sure that you are using the right block device for your sd card as failing to do so can wipe your harddrive.
 
-Replace <yourimage>.direct with your image file name and yoursdcard with your blockdevice e.g. /dev/mmcblk0 or /dev/sdb.
+Replace `<yourimage>`.direct with your image file name and yoursdcard with your blockdevice e.g. /dev/mmcblk0 or /dev/sdb.
 
     $ sudo dd if=<yourimage>.direct of=/dev/<yoursdcard> bs=1M
 
diff --git a/host/docs/usrp_x3x0.dox b/host/docs/usrp_x3x0.dox
index 766766c21..f57ec783d 100644
--- a/host/docs/usrp_x3x0.dox
+++ b/host/docs/usrp_x3x0.dox
@@ -530,7 +530,7 @@ When there is network traffic arriving at the Ethernet port, LEDs will light up.
 You can use this to make sure the network connection is correctly set up, e.g.
 by pinging the USRP and making sure the LEDs start to blink.
 
-\section x3x0_hw Hardware Notes
+\section x3x0_hw_notes Hardware Notes
 
 \subsection x3x0_hw_fpanel Front Panel