Read-only mirrors. Development, issues and pull requests are on GitHub.

summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorSergio Arroutbi2022-11-30 17:05:44 +0100
committerMartin Hořeňovský2022-12-09 23:22:10 +0100
commit8b84438be436946a2cccc01abcd3ba4a10005c1e (patch)
tree6320d1600e3def6bb03c74eac10ae3d98e496d02
parentab6c7375be9a8e71ee84c6f8537113f9f47daf99 (diff)
downloadcatch3-8b84438be436946a2cccc01abcd3ba4a10005c1e.tar.gz
Avoid usage of master when possible
Signed-off-by: Sergio Arroutbi <sarroutb@redhat.com>
-rw-r--r--Doxyfile2
-rw-r--r--docs/limitations.md2
2 files changed, 2 insertions, 2 deletions
diff --git a/Doxyfile b/Doxyfile
index 68318416..07b385ec 100644
--- a/Doxyfile
+++ b/Doxyfile
@@ -1319,7 +1319,7 @@ CHM_FILE =
HHC_LOCATION =
# The GENERATE_CHI flag controls if a separate .chi index file is generated
-# (YES) or that it should be included in the master .chm file (NO).
+# (YES) or that it should be included in the main .chm file (NO).
# The default value is: NO.
# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
diff --git a/docs/limitations.md b/docs/limitations.md
index 80471865..4bcd4de8 100644
--- a/docs/limitations.md
+++ b/docs/limitations.md
@@ -155,7 +155,7 @@ with expansion:
### Clang/G++ -- skipping leaf sections after an exception
-Some versions of `libc++` and `libstdc++` (or their runtimes) have a bug with `std::uncaught_exception()` getting stuck returning `true` after rethrow, even if there are no active exceptions. One such case is this snippet, which skipped the sections "a" and "b", when compiled against `libcxxrt` from master
+Some versions of `libc++` and `libstdc++` (or their runtimes) have a bug with `std::uncaught_exception()` getting stuck returning `true` after rethrow, even if there are no active exceptions. One such case is this snippet, which skipped the sections "a" and "b", when compiled against `libcxxrt` from the master branch
```cpp
#include <catch2/catch_test_macros.hpp>