summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicholas Corgan <nick.corgan@ettus.com>2012-11-19 12:30:30 -0800
committerNicholas Corgan <nick.corgan@ettus.com>2012-11-19 12:30:30 -0800
commit71f0b7ea5ee58cf797b29fee4e0940f3dbde3110 (patch)
tree61e114aeba965c21a7b05ca164cf631bac498365
parent1bf31032162c5fcf83364bb2b94255ed2c739d73 (diff)
parentcbac62b5175cea0e6fc990ab43f9219cc0cb5657 (diff)
downloaduhd-71f0b7ea5ee58cf797b29fee4e0940f3dbde3110.tar.gz
uhd-71f0b7ea5ee58cf797b29fee4e0940f3dbde3110.tar.bz2
uhd-71f0b7ea5ee58cf797b29fee4e0940f3dbde3110.zip
Merge branch 'maint'
-rw-r--r--host/docs/usrp2.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/host/docs/usrp2.rst b/host/docs/usrp2.rst
index 075a9684e..e675e61ba 100644
--- a/host/docs/usrp2.rst
+++ b/host/docs/usrp2.rst
@@ -316,7 +316,7 @@ This device will be referred to as the slave, and the other device, the master.
Shared ethernet mode
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
In shared Ethernet mode,
-only one device in the configuration can be attached to the Tthernet.
+only one device in the configuration can be attached to the Ethernet.
* Clock reference, time reference, and data are communicated over the MIMO cable.
* Master and slave must have different IPv4 addresses in the same subnet.