diff --git a/doc/doxygen.warnings.report.sh b/doc/doxygen.warnings.report.sh index 62d21205553..519fea88d75 100755 --- a/doc/doxygen.warnings.report.sh +++ b/doc/doxygen.warnings.report.sh @@ -251,7 +251,7 @@ REappend filter_blacklistRE "cairo-wideint" # REappend filter_blacklistRE "MakeCallback< ObjectBase \\* >(ObjectBase \\*" # ATTRIBUTE_HELPER_CPP( and _HEADER( -# REappend filter_blacklistRE "ATTRIBUTE_HELPER_\\(CPP\\|HEADER\\)" +# REappend filter_blacklistRE "ATTRIBUTE_HELPER_\\(CPP\\|HEADER\\)" # Filter out regular expression for black list, -e, -t and -F filter_outRE="" @@ -453,7 +453,7 @@ misplacedWarns=$( \ # This is to catch LaTeX formula errors. # In this case the output is of the form: # "error: Problems running latex." followed by -# "Check your installation or look for typos in _formulas.tex and check _formulas.log!" +# "Check your installation or look for typos in _formulas.tex and check _formulas.log!" # and # "Check your installation or look for typos in _formulas_dark.tex and check _formulas_dark.log!" # Hence, the count can be two. diff --git a/src/lte/doc/source/lte-design.rst b/src/lte/doc/source/lte-design.rst index 5e96ba4a24d..b06f4ada6c1 100644 --- a/src/lte/doc/source/lte-design.rst +++ b/src/lte/doc/source/lte-design.rst @@ -1169,7 +1169,7 @@ a traffic flow of user :math:`i` is characterized by following parameters: * :math:`t_{i}`: packet arrival rate (byte/sec ) * :math:`r_{i}`: token generation rate (byte/sec) - * :math:`p_{i}`: token pool size (byte) + * :math:`p_{i}`: token pool size (byte) * :math:`E_{i}`: counter that records the number of token borrowed from or given to the token bank by flow :math:`i` ; :math:`E_{i}` can be smaller than zero @@ -2893,7 +2893,7 @@ the procedure. | | | | COMPLETE | | | +------------+----------+------------+-------------+----------+------------+ | Connection | eNodeB | Send RRC | Never | 30 ms | Remove UE | - | rejected | RRC | CONNECTION | | | context | + | rejected | RRC | CONNECTION | | | context | | timeout | | REJECT | | | | +------------+----------+------------+-------------+----------+------------+ diff --git a/src/lte/doc/source/lte-testing.rst b/src/lte/doc/source/lte-testing.rst index 129f16693e6..03c0efbd159 100644 --- a/src/lte/doc/source/lte-testing.rst +++ b/src/lte/doc/source/lte-testing.rst @@ -1521,7 +1521,7 @@ Uplink Power Control Tests UE uses Uplink Power Control to automatically change Tx Power level for Uplink Physical Channels. Tx Power is computed based on path-loss, number of RB used for transmission, -some configurable parameters and TPC command from eNB. +some configurable parameters and TPC command from eNB. The test suite ``lte-uplink-power-control`` verifies if Tx Power is computed correctly. There are three different test cases: diff --git a/src/mesh/doc/source/mesh-design.rst b/src/mesh/doc/source/mesh-design.rst index 1f6793019d5..9523c585dee 100644 --- a/src/mesh/doc/source/mesh-design.rst +++ b/src/mesh/doc/source/mesh-design.rst @@ -78,25 +78,25 @@ The tasks of the peer management protocol are the following: If a peer link between the sender and receiver does not exist, a frame will be dropped. So, the plug-in to the peer management protocol (PMP) is the first -in the list of ``ns3::MeshWifiInterfaceMacPlugins`` to be used. +in the list of ``ns3::MeshWifiInterfaceMacPlugins`` to be used. Peer management protocol ~~~~~~~~~~~~~~~~~~~~~~~~ The peer management protocol consists of three main parts: -* the protocol itself, ``ns3::dot11s::PeerManagementProtocol``, which keeps all active peer links on interfaces, handles all changes of their states and notifies the routing protocol about link failures. -* the MAC plug-in, ``ns3::dot11s::PeerManagementProtocolMac``, which drops frames if there is no peer link, and peeks all needed information from management frames and information elements from beacons. -* the peer link, ``ns3::dot11s::PeerLink``, which keeps finite state machine of each peer link, keeps beacon loss counter and counter of successive transmission failures. +* the protocol itself, ``ns3::dot11s::PeerManagementProtocol``, which keeps all active peer links on interfaces, handles all changes of their states and notifies the routing protocol about link failures. +* the MAC plug-in, ``ns3::dot11s::PeerManagementProtocolMac``, which drops frames if there is no peer link, and peeks all needed information from management frames and information elements from beacons. +* the peer link, ``ns3::dot11s::PeerLink``, which keeps finite state machine of each peer link, keeps beacon loss counter and counter of successive transmission failures. The procedure of closing a peer link is not described in detail in the standard, so in the model the link may be closed by: -* beacon loss (see an appropriate attribute of ns3::dot11s::PeerLink class) +* beacon loss (see an appropriate attribute of ns3::dot11s::PeerLink class) * transmission failure – when a predefined number of successive packets have failed to transmit, the link will be closed. -The peer management protocol is also responsible for beacon collision avoidance, because it keeps beacon timing elements from all neighbours. Note that the PeerManagementProtocol is not attached to the MeshPointDevice as a routing protocol, but the structure is similar: the upper tier of the protocol is -``ns3::dot11s::PeerManagementProtocol`` and its plug-in is +The peer management protocol is also responsible for beacon collision avoidance, because it keeps beacon timing elements from all neighbours. Note that the PeerManagementProtocol is not attached to the MeshPointDevice as a routing protocol, but the structure is similar: the upper tier of the protocol is +``ns3::dot11s::PeerManagementProtocol`` and its plug-in is ``ns3::dot11s::PeerManagementProtocolMac``. Hybrid Wireless Mesh Protocol diff --git a/src/network/utils/pcap-file.h b/src/network/utils/pcap-file.h index d8fe73fc7aa..2fcac9d8887 100644 --- a/src/network/utils/pcap-file.h +++ b/src/network/utils/pcap-file.h @@ -269,7 +269,7 @@ class PcapFile * differ. * @param usec [out] Time stamp of first different packet, microseconds. Undefined if files * don't differ. - * @param packets [out] Number of first different packet. Total number of parsed packets if + * @param packets [out] Number of first different packet. Total number of parsed packets if * files don't differ. * @param snapLen Snap length (if used) * @return true if files are different, false otherwise diff --git a/src/spectrum/model/tv-spectrum-transmitter.cc b/src/spectrum/model/tv-spectrum-transmitter.cc index 0252e48d471..ebacae354d1 100644 --- a/src/spectrum/model/tv-spectrum-transmitter.cc +++ b/src/spectrum/model/tv-spectrum-transmitter.cc @@ -222,7 +222,7 @@ static std::map> g_tvSpectrumModelMap; * . * * COFDM PSD approximated from Figure 12 (8k mode) of the following article: - * Kopp, Carlo. "High Definition Television." High Definition Television. Air + * Kopp, Carlo. "High Definition Television." High Definition Television. Air * Power Australia. . * * Analog PSD approximated from Figure 4 of the following paper: diff --git a/src/spectrum/model/tv-spectrum-transmitter.h b/src/spectrum/model/tv-spectrum-transmitter.h index 7b1ce3a065d..507a6c577d4 100644 --- a/src/spectrum/model/tv-spectrum-transmitter.h +++ b/src/spectrum/model/tv-spectrum-transmitter.h @@ -84,7 +84,7 @@ class TvSpectrumTransmitter : public SpectrumPhy * Digital_Terrestrial_Television_Broadcasting_(DTTB)_Standard>. * * COFDM PSD approximated from Figure 12 (8k mode) of the following article: - * Kopp, Carlo. "High Definition Television." High Definition Television. Air + * Kopp, Carlo. "High Definition Television." High Definition Television. Air * Power Australia. . * * Analog PSD approximated from Figure 4 of the following paper: diff --git a/utils/tests/gitlab-ci-doc.yml b/utils/tests/gitlab-ci-doc.yml index 82df0e5976f..80b6e27d4d1 100644 --- a/utils/tests/gitlab-ci-doc.yml +++ b/utils/tests/gitlab-ci-doc.yml @@ -13,7 +13,7 @@ # dia is archived - pacman --noconfirm -U https://archive.archlinux.org/packages/d/dia/dia-0.97.3-9-x86_64.pkg.tar.zst # temporary revert to Doxygen 1.11.0. The package has been recompiled - # without spdlog and wizard support to fix a library dependency. + # without spdlog and wizard support to fix a library dependency. - wget -nv http://www.nsnam.org/packages/doxygen-1.11.0-4-x86_64.pkg.tar.zst - pacman --noconfirm -U doxygen-1.11.0-4-x86_64.pkg.tar.zst # no policy is a good policy. diff --git a/utils/tests/gitlab-ci-gcc.yml b/utils/tests/gitlab-ci-gcc.yml index f814b5876e4..fcd4a13db00 100644 --- a/utils/tests/gitlab-ci-gcc.yml +++ b/utils/tests/gitlab-ci-gcc.yml @@ -6,7 +6,7 @@ # We support from 10 to the latest version. Check if everything builds fine # under debug, default, and optimized, on Linux. -# The distro used is Ubuntu - the logic is: +# The distro used is Ubuntu - the logic is: # - Test minimum and maximum GCC version # - Do not test if it's the default version installed (already tested as Ubuntu test) # Note: the following is the list of default gcc versions on Ubuntu: