Merge branch 'maint'

Conflicts:
	host/include/uhd/transport/nirio/nirio_driver_iface.h

2 files changed, 5 insertions, 5 deletions

diff --git a/host/docs/octoclock.dox b/host/docs/octoclock.dox
index 58d2b1f99..362ee779f 100644
--- a/host/docs/octoclock.dox
+++ b/host/docs/octoclock.dox
@@ -92,8 +92,8 @@ The same applies for an external signal.
 
 \subsection available_sensors Available Sensors
 
-The following sensors are available on both the OctoClock and Octoclock-G; these can be queried through the
-<a href="classuhd_1_1octoclock.html">API</a>.
+The following sensors are available on both the OctoClock and Octoclock-G;
+these can be queried through the API (see uhd::usrp_clock::multi_usrp_clock::get_sensor()).
 
 - `ext_ref_detected:` whether or not the device detects an external reference
 - `gps_detected:` whether or not the device detects an internal GPSDO
diff --git a/host/lib/usrp/e300/e300_eeprom_manager.cpp b/host/lib/usrp/e300/e300_eeprom_manager.cpp
index 778e3150c..752bd3768 100644
--- a/host/lib/usrp/e300/e300_eeprom_manager.cpp
+++ b/host/lib/usrp/e300/e300_eeprom_manager.cpp
@@ -38,7 +38,7 @@ static void _string_to_bytes(const std::string &string, size_t max_len, boost::u
     for (size_t i = 0; i < len; i++){
         buffer[i] = string[i];
     }
-    if (len < max_len - 1)
+    if (len < max_len)
         buffer[len] = '\0';
 }
 
@@ -226,10 +226,10 @@ std::string e300_eeprom_manager::get_mb_type_string(void) const
         _mb_eeprom["product"]);
     switch (product) {
     case E300_MB_PID:
-        return "E300";
+        return "E3XX";
 
     case E310_MB_PID:
-        return "E310";
+        return "E3XX";
 
     default:
         return "UNKNOWN";