Merge branch 'master' into next

Conflicts:
	host/examples/CMakeLists.txt

1 files changed, 39 insertions, 39 deletions

diff --git a/host/docs/dboards.rst b/host/docs/dboards.rst
index d41bf824c..29812592f 100644
--- a/host/docs/dboards.rst
+++ b/host/docs/dboards.rst
@@ -13,7 +13,7 @@ Eventually, this page will be expanded to list out the full
 properties of each board as well.
 
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^
-Basic RX and and LFRX
+Basic RX and LFRX
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 The Basic RX and LFRX boards have 4 frontends:
 
@@ -23,21 +23,21 @@ The Basic RX and LFRX boards have 4 frontends:
 * **Frontend BA:** quadrature frontend using both antennas (QI)
 
 The boards have no tunable elements or programmable gains.
-Though the magic of aliasing, you can down-convert signals
+Through the magic of aliasing, you can down-convert signals
 greater than the Nyquist rate of the ADC.
 
 BasicRX Bandwidth (Hz): 
 
-* For Real-Mode (A or B frontend): 250M
-* For Complex (AB or BA frontend): 500M
+* **For Real-Mode (A or B frontend)**: 250M
+* **For Complex (AB or BA frontend)**: 500M
 
 LFRX Bandwidth (Hz):
 
-* For Real-Mode (A or B frontend): 33M
-* For Complex (AB or BA frontend): 66M
+* **For Real-Mode (A or B frontend)**: 33M
+* **For Complex (AB or BA frontend)**: 66M
 
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^
-Basic TX and and LFTX
+Basic TX and LFTX
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 The Basic TX and LFTX boards have 4 frontends:
 
@@ -47,30 +47,30 @@ The Basic TX and LFTX boards have 4 frontends:
 * **Frontend BA:** quadrature frontend using both antennas (QI)
 
 The boards have no tunable elements or programmable gains.
-Though the magic of aliasing, you can up-convert signals
+Through the magic of aliasing, you can up-convert signals
 greater than the Nyquist rate of the DAC.
 
 BasicTX Bandwidth (Hz): 250M
 
-* For Real-Mode (A or B frontend): 250M
-* For Complex (AB or BA frontend): 500M
+* **For Real-Mode (A or B frontend**): 250M
+* **For Complex (AB or BA frontend)**: 500M
 
 LFTX Bandwidth (Hz): 33M
 
-* For Real-Mode (A or B frontend): 33M
-* For Complex (AB or BA frontend): 66M
+* **For Real-Mode (A or B frontend)**: 33M
+* **For Complex (AB or BA frontend)**: 66M
 
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 DBSRX
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 The DBSRX board has 1 quadrature frontend.  
-It defaults to direct conversion, but can use a low IF through lo_offset in uhd::tune_request_t
+It defaults to direct conversion but can use a low IF through lo_offset in **uhd::tune_request_t**.
 
 Receive Antennas: **J3**
 
 * **Frontend 0:** Complex baseband signal from antenna J3
 
-The board has no user selectable antenna setting
+The board has no user selectable antenna setting.
 
 Receive Gains:
 
@@ -87,13 +87,13 @@ Sensors:
 DBSRX2
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 The DBSRX2 board has 1 quadrature frontend.
-It defaults to direct conversion, but can use a low IF through lo_offset in uhd::tune_request_t
+It defaults to direct conversion, but can use a low IF through lo_offset in **uhd::tune_request_t**.
 
 Receive Antennas: **J3**
 
 * **Frontend 0:** Complex baseband signal from antenna J3
 
-The board has no user selectable antenna setting
+The board has no user-selectable antenna setting.
 
 Receive Gains:
 
@@ -109,9 +109,9 @@ Sensors:
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 RFX Series
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^
-The RFX Series boards have 2 quadrature frontends, one transmit, one receive.
-Transmit defaults to low IF and Receive defaults to direct conversion.
-The IF can be adjusted through lo_offset in uhd::tune_request_t
+The RFX Series boards have 2 quadrature frontends: Transmit and Receive.
+Transmit defaults to low IF, and Receive defaults to direct conversion.
+The IF can be adjusted through lo_offset in **uhd::tune_request_t**.
 
 The RFX Series boards have independent receive and transmit LO's and synthesizers 
 allowing full-duplex operation on different transmit and receive frequencies.
@@ -185,7 +185,7 @@ WBX Series
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 The WBX Series boards have 2 quadrature frontends, one transmit, one receive.
 Transmit and Receive default to direct conversion but
-can be used in low IF mode through lo_offset in uhd::tune_request_t
+can be used in low IF mode through lo_offset in **uhd::tune_request_t**.
 
 The WBX Series boards have independent receive and transmit LO's and synthesizers 
 allowing full-duplex operation on different transmit and receive frequencies.
@@ -218,7 +218,7 @@ SBX Series
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 The SBX Series boards have 2 quadrature frontends, one transmit, one receive.
 Transmit and Receive default to direct conversion but
-can be used in low IF mode through lo_offset in uhd::tune_request_t
+can be used in low IF mode through lo_offset in **uhd::tune_request_t**.
 
 The SBX Series boards have independent receive and transmit LO's and synthesizers 
 allowing full-duplex operation on different transmit and receive frequencies.
@@ -282,7 +282,7 @@ Receive Frontends:
 * **Frontend RX1:** real-mode baseband from antenna J100
 * **Frontend RX2:** real-mode baseband from antenna J140
 
-Note: The TVRX2 has always-on AGC, the software controllable gain is the
+Note: The TVRX2 has always-on AGC; the software controllable gain is the
 final gain stage which controls the AGC set-point for output to ADC.
 
 Receive Gains:
@@ -303,8 +303,8 @@ Daughterboard Modifications
 
 Sometimes, daughterboards will require modification
 to work on certain frequencies or to work with certain hardware.
-Modification usually involves moving/removing a SMT component
-and burning a new daughterboard id into the eeprom.
+Modification usually involves moving/removing an SMT component
+and burning a new daughterboard ID into the EEPROM.
 
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 DBSRX - Mod
@@ -319,13 +319,13 @@ over the standard daughterboard clock lines.
 
 **Step 1: Move the clock configuration resistor**
 
-Remove R193 (which is 10 ohms, 0603 size) and put it on R194, which is empty.
+Remove **R193** (which is 10 ohms, 0603 size), and put it on **R194**, which is empty.
 This is made somewhat more complicated by the fact that the silkscreen is not clear in that area.
-R193 is on the back, immediately below the large beige connector, J2.
-R194 is just below, and to the left of R193.
-The silkscreen for R193 is ok, but for R194,
+**R193** is on the back, immediately below the large beige connector, **J2**.
+**R194** is just 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.
+If you lose **R193**, you can use anything from 0 to 10 ohms there.
 
 **Step 2: Burn a new daughterboard id into the EEPROM**
 
@@ -335,8 +335,8 @@ With the daughterboard plugged-in, run the following commands:
     cd <install-path>/share/uhd/utils
     ./usrp_burn_db_eeprom --id=0x000d --unit=RX --args=<args> --slot=<slot>
 
-* <args> are device address arguments (optional if only one USRP is on your machine)
-* <slot> is the name of the daughterboard slot (optional if the USRP has only one slot)
+* **<args>** are device address arguments (optional if only one USRP is on your machine)
+* **<slot>** is the name of the daughterboard slot (optional if the USRP has only one slot)
 
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 RFX - Mod
@@ -347,14 +347,14 @@ Please follow the modification procedures below:
 
 **Step 1: Disable the daughterboard clocks**
 
-Move R64 to R84, Move R142 to R153
+Move **R64** to **R84**. Move **R142** to **R153**.
 
 **Step 2: Connect the motherboard blocks**
 
-Move R35 to R36, Move R117 to R115
-These are all 0-ohm, so if you lose one, just short across the appropriate pads
+Move **R35** to **R36**. Move **R117** to **R115**.
+These are all 0-ohm, so if you lose one, just short across the appropriate pads.
 
-**Step 3: Burn the appropriate daughterboard id into the EEPROM**
+**Step 3: Burn the appropriate daughterboard ID into the EEPROM**
 
 With the daughterboard plugged-in, run the following commands:
 ::
@@ -363,19 +363,19 @@ With the daughterboard plugged-in, run the following commands:
     ./usrp_burn_db_eeprom --id=<rx_id> --unit=RX --args=<args> --slot=<slot>
     ./usrp_burn_db_eeprom --id=<tx_id> --unit=TX --args=<args> --slot=<slot>
 
-* <rx_id> choose the appropriate RX ID for your daughterboard
+* **<rx_id>** choose the appropriate RX ID for your daughterboard
 
   * **RFX400:** 0x0024
   * **RFX900:** 0x0025
   * **RFX1800:** 0x0034
   * **RFX1200:** 0x0026
   * **RFX2400:** 0x0027
-* <tx_id> choose the appropriate TX ID for your daughterboard
+* **<tx_id>** choose the appropriate TX ID for your daughterboard
 
   * **RFX400:** 0x0028
   * **RFX900:** 0x0029
   * **RFX1800:** 0x0035
   * **RFX1200:** 0x002a
   * **RFX2400:** 0x002b
-* <args> are device address arguments (optional if only one USRP is on your machine)
-* <slot> is the name of the daughterboard slot (optional if the USRP has only one slot)
+* **<args>** are device address arguments (optional if only one USRP is on your machine)
+* **<slot>** is the name of the daughterboard slot (optional if the USRP has only one slot)