Refs 15766: addressing reviewer's comments

Signed-off-by: Miguel Barro <miguelbarro@eprosima.com>
eProsima · Nov 11, 2022 · da8af4f · da8af4f
1 parent 3cdf71b
commit da8af4f
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/docs/installation/configuration/cmake_options.rst b/docs/installation/configuration/cmake_options.rst
@@ -140,8 +140,7 @@ dependency on other options.
           Note that setting the flag ``OFF`` will not prevent the use of the custom implementation in those
           frameworks that default to ``PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP``.
           This flag prevents thread sanitizer reports on GCC/Clang STL implementations.
-        - ``ON`` ``OFF``
-        - ``OFF`` (linux & Mac), ``ON`` (Windows)
+        - ``OFF`` (Linux & Mac), ``ON`` (Windows)
     *   - :class:`SANITIZER`
         - Adds run-time instrumentation to the code. Supported options are:
 
@@ -151,7 +150,6 @@ dependency on other options.
         - ``OFF``
 
 .. _POSIX: https://man7.org/linux/man-pages/man3/pthread_rwlockattr_setkind_np.3.html
->>>>>>> 1eb7e19d (Refs 15766: update shared_mutex docs)
 
 Log options
 ^^^^^^^^^^^

diff --git a/docs/spelling_wordlist.txt b/docs/spelling_wordlist.txt
@@ -122,7 +122,6 @@ latencies
 Libp
 libs
 lifecycle
-linux
 localhost
 localtime
 LogTopic