From ab18b7e46655dc5dcd29dc0d778e80e001c73435 Mon Sep 17 00:00:00 2001
From: "Peter D. Barnes, Jr." <barnes26@llnl.gov>
Date: Thu, 30 May 2013 13:53:56 -0700
Subject: [PATCH] Fix document building errors

---
 src/fd-net-device/doc/fd-net-device.rst       |   2 +-
 .../source/figures/lte-subframe-structure.dia | Bin 2049 -> 29002 bytes
 src/lte/doc/source/lte-design.rst             |   4 ++--
 src/lte/doc/source/lte-testing.rst            |   2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/fd-net-device/doc/fd-net-device.rst b/src/fd-net-device/doc/fd-net-device.rst
index 1f3eebebb..d5a0d45ef 100644
--- a/src/fd-net-device/doc/fd-net-device.rst
+++ b/src/fd-net-device/doc/fd-net-device.rst
@@ -273,7 +273,7 @@ It is always up to the user to determine that using these MAC addresses is okay
 on your network and won't conflict with anything else (including another
 simulation using such devices) on your network. If you are using the emulated
 FdNetDevice configuration in separate simulations,
- you must consider global MAC address
+you must consider global MAC address
 assignment issues and ensure that MAC addresses are unique across all
 simulations. The emulated net device respects the MAC address provided in the
 ``Address`` attribute so you can do this manually. For larger simulations, you
diff --git a/src/lte/doc/source/figures/lte-subframe-structure.dia b/src/lte/doc/source/figures/lte-subframe-structure.dia
index 6fe433c78685feead55f67a5771fbd79e2600db8..b88255bffc2e1126e9c70217bc292575c62f1d73 100644
GIT binary patch
literal 29002
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

literal 2049
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

diff --git a/src/lte/doc/source/lte-design.rst b/src/lte/doc/source/lte-design.rst
index 58ceddeb2..22a5c7d74 100644
--- a/src/lte/doc/source/lte-design.rst
+++ b/src/lte/doc/source/lte-design.rst
@@ -1044,7 +1044,7 @@ where :math:`|\cdot|` indicates the cardinality of the set; finally,
    \right)}{\tau}
    
 
-For what concern the HARQ, PF implements the non adaptive version, which implies that in allocating the retransmission attempts the scheduler uses the same allocation configuration of the original block, which means maintaining the same RBGs and MCS. UEs that are allocated for HARQ retransmissions are not considered for the transmission of new data in case they have a transmission opportunity available in the same TTI. Finally, HARQ can be disabled with ns3 attribute system for maintaining backward compatibility with old test cases and code, in detail::
+For what concern the HARQ, PF implements the non adaptive version, which implies that in allocating the retransmission attempts the scheduler uses the same allocation configuration of the original block, which means maintaining the same RBGs and MCS. UEs that are allocated for HARQ retransmissions are not considered for the transmission of new data in case they have a transmission opportunity available in the same TTI. Finally, HARQ can be disabled with ns3 attribute system for maintaining backward compatibility with old test cases and code, in detail.
 
 
 Maximum Throughput (MT) Scheduler
@@ -1061,7 +1061,7 @@ Let :math:`i,j` denote generic users; let :math:`t` be the
 subframe index, and :math:`k` be the resource block index; let :math:`M_{i,k}(t)` be MCS
 usable by user :math:`i` on resource block :math:`k` according to what reported by the AMC
 model (see `Adaptive Modulation and Coding`_); finally, let :math:`S(M, B)` be the TB
-size in bits as defined in [TS36.213]_ for the case where a number :math:`B` of
+size in bits as defined in [TS36213]_ for the case where a number :math:`B` of
 resource blocks is used. The achievable rate :math:`R_{i}(k,t)` in bit/s for user :math:`i`
 on resource block :math:`k` at subframe :math:`t` is defined as 
 
diff --git a/src/lte/doc/source/lte-testing.rst b/src/lte/doc/source/lte-testing.rst
index 74f09a05e..e2adcafb8 100644
--- a/src/lte/doc/source/lte-testing.rst
+++ b/src/lte/doc/source/lte-testing.rst
@@ -369,7 +369,7 @@ at the given SNR, while reference throughput value for other UEs by zero.
 Let :math:`\tau` be the TTI duration, :math:`B` the transmission
 bandwidth configuration in number of RBs, :math:`M` the modulation and
 coding scheme in use at the given SNR and :math:`S(M, B)` be the
-transport block size as defined in [TS36.213]_. The reference
+transport block size as defined in [TS36213]_. The reference
 throughput :math:`T` in bit/s achieved by each UE is calculated as 
 
 .. math::