Merge pull request #16 from Progmasoft/chore/remove-upstream-leftovers

Remove what Catch2's maintainers left that is not ours

34 files changed, 132 insertions, 3672 deletions

diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
deleted file mode 100644
index 9122aa8a..00000000
--- a/.github/FUNDING.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-github: "horenmar"
-custom: "https://www.paypal.me/horenmar"
diff --git a/CMake/catch2-with-main.pc.in b/CMake/catch2-with-main.pc.in
index eeac3e35..e20a28f9 100644
--- a/CMake/catch2-with-main.pc.in
+++ b/CMake/catch2-with-main.pc.in
@@ -4,7 +4,7 @@ pkg_version=@Catch2_VERSION@
 
 Name: Catch2 with main function
 Description: A modern, C++-native test framework for C++14 and above (links in default main)
-URL: https://github.com/catchorg/Catch2
+URL: https://github.com/Progmasoft/catch3
 Version: ${pkg_version}
 Requires: catch2 = ${pkg_version}
 Libs: -L${libdir} -l@lib_name@
diff --git a/CMake/catch2.pc.in b/CMake/catch2.pc.in
index 74e22c15..93886089 100644
--- a/CMake/catch2.pc.in
+++ b/CMake/catch2.pc.in
@@ -4,8 +4,8 @@ includedir=${prefix}/@include_dir@
 libdir=${prefix}/@lib_dir@
 
 Name: Catch2
-Description: A modern, C++-native, test framework for C++14 and above
-URL: https://github.com/catchorg/Catch2
+Description: Catch3, Catch2's test API with its own runner; headers need C++14 and above
+URL: https://github.com/Progmasoft/catch3
 Version: @Catch2_VERSION@
 Cflags: -I${includedir}
 Libs: -L${libdir} -l@lib_name@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a8f1da6d..6510f62d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -37,8 +37,8 @@ endif()
 project(Catch2
   VERSION 3.16.1 # CML version placeholder, don't delete
   LANGUAGES CXX
-  HOMEPAGE_URL "https://github.com/catchorg/Catch2"
-  DESCRIPTION "A modern, C++-native, unit test framework."
+  HOMEPAGE_URL "https://github.com/Progmasoft/catch3"
+  DESCRIPTION "Catch2's test API with a parallel runner, property testing and snapshots."
 )
 
 # Provide path for scripts. We first add path to the scripts we don't use,
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
index be1a688e..c132abab 100644
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -34,7 +34,7 @@ This Code of Conduct applies both within project spaces and in public spaces whe
 
 ## Enforcement
 
-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at github@philnash.me. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting Progmasoft at support@progmasoft.com. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
 
 Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
 
diff --git a/Doxyfile b/Doxyfile
index 83b4f215..4d248a61 100644
--- a/Doxyfile
+++ b/Doxyfile
@@ -42,7 +42,7 @@ DOXYFILE_ENCODING      = UTF-8
 # title of most generated pages and in a few other places.
 # The default value is: My Project.
 
-PROJECT_NAME           = Catch2
+PROJECT_NAME           = Catch3
 
 # The PROJECT_NUMBER tag can be used to enter a project or revision number. This
 # could be handy for archiving the generated documentation or if some version
@@ -54,7 +54,7 @@ PROJECT_NUMBER         =
 # for a project that appears at the top of each page and should give viewer a
 # quick idea about the purpose of the project. Keep the description short.
 
-PROJECT_BRIEF          = "Popular C++ unit testing framework"
+PROJECT_BRIEF          = "Catch2's test API with a parallel runner, property testing and snapshots"
 
 # With the PROJECT_LOGO tag one can specify a logo or an icon that is included
 # in the documentation. The maximum height of the logo should not exceed 55
diff --git a/MAINTAINERS.md b/MAINTAINERS.md
deleted file mode 100644
index 574418a7..00000000
--- a/MAINTAINERS.md
+++ /dev/null
@@ -1,11 +0,0 @@
-<a id="top"></a>
-# Catch2 Maintainers
-
-## Current
-
-* Chris Thrasher ([@christhrasher](https://github.com/ChrisThrasher)), gpg key: 56FB686C9DFC8E2C
-* Martin Hořeňovský ([@horenmar](https://github.com/horenmar)), gpg key: E29C46F3B8A7502860793B7DECC9C20E314B2360
-
-## Retired
-
-* Phil Nash ([@philsquared](https://github.com/philsquared))
diff --git a/appveyor.yml b/appveyor.yml
deleted file mode 100644
index ba4556ea..00000000
--- a/appveyor.yml
+++ /dev/null
@@ -1,83 +0,0 @@
-version: "{build}-{branch}"
-
-# If we ever get a backlog larger than clone_depth, builds will fail
-# spuriously. I do not think we will ever get 20 deep commits deep though.
-clone_depth: 20
-
-# We want to build everything, except for branches that are explicitly
-# for messing around with Github Actions.
-branches:
-  except:
-    - /devel-gha.+/
-
-
-# We need a more up to date pip because Python 2.7 is EOL soon
-init:
-  - set PATH=C:\Python35;C:\Python35\Scripts;%PATH%
-
-
-install:
-  - ps: if (($env:CONFIGURATION) -eq "Debug" -And ($env:coverage) -eq "1" ) { pip --disable-pip-version-check install codecov }
-  # This removes our changes to PATH. Keep this step last!
-  - ps: if (($env:CONFIGURATION) -eq "Debug" -And ($env:coverage) -eq "1" ) { .\tools\misc\installOpenCppCoverage.ps1 }
-
-
-before_build:
-  # We need to modify PATH again, because it was reset since the "init" step
-  - set PATH=C:\Python35;C:\Python35\Scripts;%PATH%
-  - set CXXFLAGS=%additional_flags%
-  # If we are building examples/extra-tests, we need to regenerate the amalgamated files
-  - cmd: if "%examples%"=="1" ( python .\tools\scripts\generateAmalgamatedFiles.py )
-  # Indirection because appveyor doesn't handle multiline batch scripts properly
-  # https://stackoverflow.com/questions/37627248/how-to-split-a-command-over-multiple-lines-in-appveyor-yml/37647169#37647169
-  # https://help.appveyor.com/discussions/questions/3888-multi-line-cmd-or-powershell-warning-ignore
-  - cmd: .\tools\misc\appveyorBuildConfigurationScript.bat
-
-
-# build with MSBuild
-build:
-  project: Build\Catch2.sln             # path to Visual Studio solution or project
-  parallel: true                        # enable MSBuild parallel builds
-  verbosity: normal                     # MSBuild verbosity level {quiet|minimal|normal|detailed}
-
-test_script:
-  - set CTEST_OUTPUT_ON_FAILURE=1
-  - cmd: .\tools\misc\appveyorTestRunScript.bat
-
-
-# Sadly we cannot use the standard "dimensions" based approach towards
-# specifying the different builds, as there is no way to add one-offs
-# builds afterwards. This means that we will painfully specify each
-# build explicitly.
-environment:
-  matrix:
-    - FLAVOR: VS 2019 x64 Debug Coverage Examples
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
-      examples: 1
-      coverage: 1
-      platform: x64
-      configuration: Debug
-
-    - FLAVOR: VS 2019 x64 Debug WMain
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
-      wmain: 1
-      additional_flags: "/D_UNICODE /DUNICODE"
-      platform: x64
-      configuration: Debug
-
-    - FLAVOR: VS 2019 x64 Debug Latest Strict
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
-      additional_flags: "/permissive- /std:c++latest"
-      platform: x64
-      configuration: Debug
-
-    - FLAVOR: VS 2017 x64 Debug
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-      platform: x64
-      configuration: Debug
-
-    - FLAVOR: VS 2017 x64 Release Coverage
-      APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-      coverage: 1
-      platform: x64
-      configuration: Debug
diff --git a/data/artwork/catch2-c-logo.svg b/data/artwork/catch2-c-logo.svg
deleted file mode 100644
index 2c736986..00000000
--- a/data/artwork/catch2-c-logo.svg
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   width="104.41245mm"
-   height="120.99883mm"
-   viewBox="0 0 101.59999 117.7396"
-   version="1.1"
-   id="svg1"
-   inkscape:version="1.4-beta (62f545ba5e, 2024-04-22)"
-   sodipodi:docname="catch2-c-logo.svg"
-   xml:space="preserve"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg"><sodipodi:namedview
-     id="namedview1"
-     pagecolor="#ffffff"
-     bordercolor="#000000"
-     borderopacity="0.25"
-     inkscape:showpageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="0"
-     inkscape:deskcolor="#d1d1d1"
-     inkscape:document-units="mm"
-     inkscape:zoom="2"
-     inkscape:cx="181"
-     inkscape:cy="192.25"
-     inkscape:window-width="2560"
-     inkscape:window-height="1411"
-     inkscape:window-x="-9"
-     inkscape:window-y="-6"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg1"
-     inkscape:clip-to-page="false" /><defs
-     id="defs1"><inkscape:path-effect
-       effect="bspline"
-       id="path-effect21"
-       is_visible="true"
-       lpeversion="1.3"
-       weight="33.333333"
-       steps="2"
-       helper_size="0"
-       apply_no_weight="true"
-       apply_with_weight="true"
-       only_selected="false"
-       uniform="false" /><inkscape:path-effect
-       effect="mirror_symmetry"
-       start_point="73.777381,64.846856"
-       end_point="82.510207,65.15"
-       center_point="78.143794,64.998428"
-       id="path-effect17"
-       is_visible="true"
-       lpeversion="1.2"
-       lpesatellites=""
-       mode="free"
-       discard_orig_path="false"
-       fuse_paths="true"
-       oposite_fuse="false"
-       split_items="false"
-       split_open="false"
-       link_styles="false" /></defs><g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="Layer 1"
-     style="display:inline;opacity:1"><path
-       style="display:inline;opacity:1;fill:#ff2500;fill-opacity:1;stroke:none"
-       d="m 51.144204,74.60863 c 2.755126,3.847649 8.114087,5.089451 12.620377,4.385634 2.354879,-0.367807 8.839176,-2.41493 8.839176,-4.301423 V 61.300036 c 0,-0.274854 -4.644748,-5.35579 -14.139807,-4.033868 -7.781631,0.854243 -12.297148,10.391313 -7.319746,17.342462 z"
-       id="path19" /><path
-       style="display:inline;opacity:1;fill:#000000;fill-opacity:1;stroke:none"
-       d="M 51.858331,11.754161 C 41.642983,13.144685 33.527664,20.30548 26.946464,27.781252 13.41997,43.146393 1.1940791,63.412939 0.27499404,84.40209 c -0.2484557,5.673984 0.0720803,11.551339 2.02561406,16.93334 6.4303318,17.71559 27.0809729,18.5262 42.4139739,13.56112 9.635256,-3.12006 19.559145,-9.05196 26.722916,-16.206958 2.544515,-2.541399 6.489211,-6.811827 4.760053,-10.836485 -0.807945,-1.880505 -3.120844,-1.771387 -4.760053,-1.239217 -3.777039,1.226226 -7.054253,3.815005 -10.31875,5.990284 -8.595381,5.727494 -18.582582,10.587386 -29.104166,10.583336 -5.314431,-0.002 -11.064865,-1.53917 -14.276067,-6.085419 C 14.249559,92.162607 14.966246,85.515419 15.941144,79.904173 18.379578,65.869225 26.039129,51.275896 34.494849,39.952087 37.975232,35.291195 43.042486,28.027749 49.477081,27.54157 c 2.673121,-0.201974 4.452111,1.728755 5.613208,3.943849 2.172279,4.144192 2.284401,8.974146 4.143505,13.229168 1.160297,2.655628 3.911041,5.951729 7.175599,4.380934 4.423264,-2.128318 5.563981,-8.759454 5.557271,-13.112185 -0.0164,-10.64231 -7.561412,-25.937074 -20.108333,-24.229175"
-       id="path14" /><path
-       style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.14596;stroke-linecap:round"
-       d="m 53.953228,68.740885 v -1.206827 h 3.137751 v -3.266479 h 1.174645 v 3.266479 h 3.073387 v 1.206827 h -3.073387 v 3.202116 h -1.174645 v -3.202116 z"
-       id="path15"
-       sodipodi:nodetypes="ccccccccccccc" /><path
-       style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.14596;stroke-linecap:round"
-       d="m 62.418518,68.740885 v -1.206827 h 3.137751 v -3.266479 h 1.174645 v 3.266479 h 3.073387 v 1.206827 h -3.073387 v 3.202116 h -1.174645 v -3.202116 z"
-       id="path16"
-       sodipodi:nodetypes="ccccccccccccc" /><path
-       d="M 85.440222,24.062768 C 86.646399,22.95745 88.272019,22.342526 89.673556,21.247484 94.611094,17.389708 103.0499,9.5981005 101.23198,3.5611216 100.54356,1.2749953 97.954172,0.02851298 95.475242,0.19207103 92.915127,0.3609856 90.311542,1.5166605 88.615222,2.3873449 86.831645,3.3028167 85.048448,3.2384541 84.477375,4.6552681 83.67664,6.6418721 85.77327,9.3242102 87.820455,9.0669662 88.433774,8.9898962 89.041201,8.700584 89.29669,8.1526509 89.865278,6.9332293 90.823337,6.6449856 92.781525,5.7141794 94.684453,4.8096405 96.75508,4.4020758 95.458862,7.6585999 93.598546,12.332323 85.734679,17.924982 80.774891,21.407129 c 0,0 -2.282573,1.504251 -2.853005,1.705572 -1.235548,0.436059 -2.378469,0.514326 -2.192851,1.747903 0.209704,1.393648 1.686087,2.720176 2.912476,2.922238 2.91246,0.479863 3.255425,0.04457 7.857045,0.896861 1.782728,0.330191 4.511564,1.873082 5.236267,1.861978 1.114192,-0.01707 2.38496,-5.01e-4 3.098369,-0.950708 1.003097,-1.336037 0.164345,-3.66292 -1.202522,-4.426382 -2.017657,-1.126959 -6.832185,-0.826419 -8.190448,-1.101823"
-       style="display:inline;opacity:1;fill:#ff2500;fill-opacity:1;stroke:none"
-       id="path1"
-       inkscape:label="path1"
-       sodipodi:nodetypes="csssssssssssssssssc" /><circle
-       style="display:inline;opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.14596;stroke-linecap:round"
-       id="path20"
-       cx="81.427208"
-       cy="64.690056"
-       r="1.1207407" /><circle
-       style="display:inline;opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.14596;stroke-linecap:round"
-       id="circle21"
-       cx="81.427208"
-       cy="71.551033"
-       r="1.1207407" /><path
-       style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.14596;stroke-linecap:round"
-       d="M 73.866479,74.571917 V 61.475751 c 0.716819,0.227562 4.096107,2.192671 4.096107,6.519638 0,4.326967 -3.010942,6.386799 -4.096107,6.576528 z"
-       id="path21"
-       sodipodi:nodetypes="cczc" /><path
-       style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.14596;stroke-linecap:round"
-       d="m 77.405059,65.799422 3.424802,-1.331236 0.204807,0.933002 -3.652363,1.353992 z"
-       id="path22" /><path
-       style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.14596;stroke-linecap:round"
-       d="m 77.427815,70.4303 3.094839,1.115049 0.40961,-0.739575 -3.402045,-1.433636 z"
-       id="path23" /></g></svg>
diff --git a/data/artwork/catch2-hand-logo.svg b/data/artwork/catch2-hand-logo.svg
deleted file mode 100644
index 3b24df11..00000000
--- a/data/artwork/catch2-hand-logo.svg
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   width="221.19167mm"
-   height="254mm"
-   viewBox="0 0 221.19167 254"
-   version="1.1"
-   id="svg1"
-   inkscape:version="1.4-beta (62f545ba5e, 2024-04-22)"
-   sodipodi:docname="catch2-hand-logo.svg"
-   xml:space="preserve"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg"><sodipodi:namedview
-     id="namedview1"
-     pagecolor="#ffffff"
-     bordercolor="#000000"
-     borderopacity="0.25"
-     inkscape:showpageshadow="2"
-     inkscape:pageopacity="0.0"
-     inkscape:pagecheckerboard="false"
-     inkscape:deskcolor="#d1d1d1"
-     inkscape:document-units="mm"
-     inkscape:zoom="0.75528389"
-     inkscape:cx="423.01975"
-     inkscape:cy="494.51604"
-     inkscape:window-width="2560"
-     inkscape:window-height="1411"
-     inkscape:window-x="-9"
-     inkscape:window-y="-6"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="layer3" /><defs
-     id="defs1" /><g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="Layer 1"
-     style="display:inline;opacity:1"><path
-       style="display:inline;fill:#ff2500;fill-opacity:1;stroke:none;stroke-width:0.997109"
-       d="m 167.951,135.96691 c 2.74718,3.83654 8.09064,5.07475 12.58391,4.37297 2.34808,-0.36675 8.81363,-2.40795 8.81363,-4.28899 v -13.3541 c 0,-0.27407 -4.63132,-5.34032 -14.09894,-4.02222 -7.75915,0.85177 -12.26161,10.36129 -7.2986,17.29234 z"
-       id="path19" /><path
-       style="display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.997109"
-       d="m 168.66307,73.294073 c -10.18583,1.386506 -18.27769,8.526609 -24.83988,15.980778 -13.4874,15.320749 -25.67797,35.528729 -26.59439,56.457219 -0.24775,5.65759 0.0719,11.51796 2.01975,16.88442 6.41176,17.66439 27.00272,18.47266 42.29142,13.52193 9.6074,-3.11105 19.50262,-9.0258 26.64569,-16.16012 2.53716,-2.53406 6.47045,-6.79215 4.7463,-10.80518 -0.80561,-1.87507 -3.11182,-1.76626 -4.7463,-1.23563 -3.76612,1.22268 -7.03387,3.80398 -10.28893,5.97297 -8.57055,5.71095 -18.52889,10.55679 -29.02007,10.55276 -5.29907,-0.002 -11.03289,-1.53473 -14.23481,-6.06784 -3.47888,-4.92522 -2.76426,-11.55319 -1.79218,-17.14822 2.43139,-13.99439 10.06881,-28.54555 18.5001,-39.83664 3.47032,-4.647428 8.52293,-11.889884 14.93893,-12.374659 2.6654,-0.20139 4.43924,1.72376 5.59699,3.932453 2.166,4.132217 2.2778,8.948216 4.13153,13.190946 1.15694,2.64795 3.89974,5.93453 7.15487,4.36828 4.41048,-2.12217 5.5479,-8.73415 5.5412,-13.074306 -0.0164,-10.611557 -7.53956,-25.862124 -20.05022,-24.159161"
-       id="path14" /><path
-       style="display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.145538;stroke-linecap:round"
-       d="m 170.75192,130.11613 v -1.20334 h 3.12868 v -3.25705 h 1.17125 v 3.25705 h 3.0645 v 1.20334 h -3.0645 v 3.19287 h -1.17125 v -3.19287 z"
-       id="path15"
-       sodipodi:nodetypes="ccccccccccccc" /><path
-       style="display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.145538;stroke-linecap:round"
-       d="m 179.19274,130.11613 v -1.20334 h 3.12869 v -3.25705 h 1.17125 v 3.25705 h 3.0645 v 1.20334 h -3.0645 v 3.19287 h -1.17125 v -3.19287 z"
-       id="path16"
-       sodipodi:nodetypes="ccccccccccccc" /><path
-       d="m 204.99654,83.647387 c 1.20269,-1.102124 2.82361,-1.715271 4.2211,-2.807149 4.92327,-3.846627 13.33769,-11.61572 11.52502,-17.635254 -0.68642,-2.27952 -3.26833,-3.5224 -5.7401,-3.359314 -2.55271,0.168426 -5.14878,1.320761 -6.8402,2.18893 -1.77842,0.912826 -3.55647,0.84865 -4.12589,2.26137 -0.79842,1.980862 1.29215,4.655449 3.33343,4.398949 0.61154,-0.07684 1.21721,-0.365323 1.47197,-0.911673 0.56694,-1.215898 1.52223,-1.503309 3.47476,-2.431425 1.89743,-0.901925 3.96207,-1.308312 2.6696,1.938802 -1.85495,4.660217 -9.69609,10.236715 -14.64154,13.7088 0,0 -2.27598,1.499904 -2.84476,1.700643 -1.23198,0.434799 -2.37159,0.512839 -2.18652,1.742852 0.2091,1.38962 1.68122,2.712316 2.90406,2.913793 2.90404,0.478477 3.24602,0.04444 7.83434,0.89427 1.77758,0.329237 4.49854,1.867669 5.22114,1.856598 1.11097,-0.01702 2.37807,-5e-4 3.08942,-0.947962 1.00019,-1.332175 0.16387,-3.652334 -1.19905,-4.41359 -2.01182,-1.123702 -6.81244,-0.824031 -8.16678,-1.09864"
-       style="display:inline;fill:#ff2500;fill-opacity:1;stroke:none;stroke-width:0.997109"
-       id="path1-4"
-       inkscape:label="path2"
-       sodipodi:nodetypes="csssssssssssssssssc" /><circle
-       style="display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.145538;stroke-linecap:round"
-       id="path20"
-       cx="198.14651"
-       cy="126.077"
-       r="1.117502" /><circle
-       style="display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.145538;stroke-linecap:round"
-       id="circle21"
-       cx="198.14651"
-       cy="132.91815"
-       r="1.117502" /><path
-       style="display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.145538;stroke-linecap:round"
-       d="m 190.60762,135.93031 v -13.05833 c 0.71475,0.22692 4.08427,2.18634 4.08427,6.50081 0,4.31446 -3.00224,6.36834 -4.08427,6.55752 z"
-       id="path21"
-       sodipodi:nodetypes="cczc" /><path
-       style="display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.145538;stroke-linecap:round"
-       d="m 194.13597,127.18316 3.41491,-1.32739 0.20422,0.93031 -3.64181,1.35009 z"
-       id="path22" /><path
-       style="display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.145538;stroke-linecap:round"
-       d="m 194.15867,131.80066 3.08589,1.11183 0.40843,-0.73744 -3.39221,-1.42949 z"
-       id="path23" /><path
-       style="opacity:1;fill:#000000"
-       d="m 52.485231,274.30677 c -1.44545,-0.96726 -2.86981,-3.09456 -3.13906,-4.6882 -0.39677,-2.34847 0.81078,-4.39701 5.15499,-8.74518 20.43177,-20.45035 46.487389,-31.49087 92.078009,-39.01608 2.25557,-0.37231 4.92152,-0.92104 5.92434,-1.21941 4.02143,-1.19651 9.24392,-3.85561 19.87253,-10.11836 9.8535,-5.80602 12.12477,-6.79037 15.66794,-6.79037 2.05936,0 4.57269,2.67656 4.57269,4.86966 0,1.68904 -2.6986,6.0579 -4.7121,7.6286 -2.28208,1.78021 -6.58253,4.6015 -11.7076,7.68073 -9.06231,5.44478 -11.98022,6.71427 -21.41534,9.31715 -5.04752,1.39246 -16.38447,4.02852 -25.53267,5.93683 -25.13851,5.24388 -25.00563,5.21162 -29.765619,7.22491 -7.03101,2.97384 -16.88366,8.57665 -28.32629,16.10804 -4.97279,3.27302 -5.23095,3.48606 -6.59919,5.44572 -2.03051,2.90821 -4.81825,5.75178 -6.42266,6.55129 -2.02273,1.00797 -3.9618,0.94437 -5.64997,-0.18533 z M 2.1166706,214.04812 c -4.43974,-1.17966 -6.29001,-2.86592 -6.50258,-5.92618 -0.0561,-0.80826 -0.34243,-2.18306 -0.6362,-3.05512 -0.29378,-0.87205 -0.53414,-2.12574 -0.53414,-2.78598 0,-2.4519 9.57939,-32.76364 14.76039,-46.70584 C 21.897901,121.41582 36.072191,94.814185 53.824111,71.834375 c 11.92384,-15.435387 26.74991,-30.208723 41.2936,-41.146727 5.899709,-4.437045 11.752929,-7.682035 15.523289,-8.606009 2.83253,-0.694146 6.49309,-0.456289 8.54715,0.55538 0.86947,0.428233 2.07876,1.254856 2.6873,1.836939 1.24377,1.189682 1.58018,2.435151 1.36349,5.048044 -0.19501,2.351645 -1.01118,3.232511 -6.23188,6.725914 -2.50094,1.67349 -7.49666,5.375621 -11.10159,8.226959 -8.626469,6.823143 -12.675559,9.813426 -18.592969,13.731047 -4.5713,3.026431 -5.19257,3.540143 -9.40057,7.773067 -6.75068,6.79066 -18.35611,20.995666 -21.41793,26.215466 -7.26888,12.392015 -19.02869,38.165965 -27.46982,60.205545 -7.14782,18.66277 -15.28897,43.14897 -16.8808,50.77253 -1.36968,6.55961 -2.3943804,8.86415 -4.6390304,10.43312 -1.42141,0.99355 -2.86689,1.11226 -5.38768,0.44247 z M 84.451711,131.53763 c -2.71586,-1.44798 -4.39099,-4.45284 -3.91041,-7.01452 0.22361,-1.19197 2.16953,-4.12452 4.94017,-7.44499 2.77937,-3.33091 13.49664,-14.08622 17.176859,-17.237833 20.86316,-17.866412 44.82366,-30.594172 72.62813,-38.579882 13.98648,-4.017052 21.64688,-4.578234 28.9691,-2.122202 2.68998,0.902278 3.92015,1.642753 4.93107,2.968151 2.42706,3.182092 1.37728,7.464086 -2.28839,9.334167 -1.72612,0.880603 -5.30307,1.720503 -18.52445,4.349714 -34.65213,6.890939 -45.21368,10.483785 -64.01962,21.778305 -4.90594,2.94642 -12.73144,8.97117 -19.60898,15.0967 -4.21536,3.75444 -5.629099,5.40595 -7.922789,9.25525 -2.61622,4.39059 -3.64884,5.89007 -5.11311,7.42481 -2.32969,2.44183 -5.17662,3.30181 -7.25758,2.19233 z m -19.34134,-7.37312 c -0.67308,-0.23773 -1.75582,-0.98544 -2.55596,-1.76505 -1.563,-1.52288 -2.12938,-2.99059 -1.84499,-4.78105 0.49788,-3.13453 6.69521,-13.63592 13.12251,-22.236119 17.01101,-22.761971 41.464519,-41.822254 69.705419,-54.331885 8.97055,-3.973604 14.33402,-5.413308 20.23973,-5.432901 6.16545,-0.02045 10.0683,1.082726 12.13437,3.429906 2.78341,3.162114 2.82958,6.444745 0.12416,8.826153 -1.53485,1.351031 -4.80881,2.63842 -18.21165,7.161207 -31.8573,10.75024 -42.5879,16.147741 -58.492839,29.421967 -5.67746,4.738392 -13.21765,12.843914 -18.77808,20.185972 -2.50637,3.30944 -3.41949,5.02515 -5.06932,9.525 -2.27988,6.21828 -3.86567,8.69854 -6.28046,9.823 -1.53672,0.71558 -2.4493,0.75433 -4.09289,0.1738 z"
-       id="path1"
-       sodipodi:nodetypes="sssssssssssssssssscssssssssssssssssssssscssssssssssssssssssssssss"
-       transform="translate(5.8208328,-21.43125)" /></g></svg>
diff --git a/docs/Readme.md b/docs/Readme.md
index 5d21ef7f..65268c99 100644
--- a/docs/Readme.md
+++ b/docs/Readme.md
@@ -50,10 +50,6 @@ engine, not a claim that Catch3 is an official Catch2 release.
 * [Thread safety of the compatibility engine](thread-safety.md#top)
 
 **Other:**
-* [Why the Catch2 compatibility base?](why-catch.md#top)
-* [Migrating from v2 to v3](migrate-v2-to-v3.md#top)
-* [Historical Catch2 open-source users](opensource-users.md#top)
-* [Historical Catch2 commercial users](commercial-users.md#top)
-* [Upstream contribution guide (historical)](contributing.md#top)
-* [Upstream release notes (historical)](release-notes.md#top)
-* [Upstream deprecations (historical)](deprecations.md#top)
+* [Release notes](release-notes.md#top)
+* [Contributing](contributing.md#top)
+* [Migrating from Catch2 v2 to v3](migrate-v2-to-v3.md#top)
diff --git a/docs/commercial-users.md b/docs/commercial-users.md
deleted file mode 100644
index 44df8c52..00000000
--- a/docs/commercial-users.md
+++ /dev/null
@@ -1,26 +0,0 @@
-<a id="top"></a>
-
-> **Upstream history:** This page is retained from Catch2 for provenance and compatibility. It does not describe Catch3 release policy or Progmasoft support. See [Catch3 documentation](Readme.md#top) for current guidance.
-
-# Commercial users of Catch2
-
-Catch2 is also widely used in proprietary code bases. This page contains
-some of them that are willing to share this information.
-
-If you want to add your organisation, please check that there is no issue
-with you sharing this fact.
-
- - Bloomberg
- - [Bloomlife](https://bloomlife.com)
- - [Inscopix Inc.](https://www.inscopix.com/)
- - Locksley.CZ
- - [Makimo](https://makimo.pl/)
- - NASA
- - [Nexus Software Systems](https://nexwebsites.com)
- - [UX3D](https://ux3d.io)
- - [King](https://king.com)
-
-
----
-
-[Home](Readme.md#top)
diff --git a/docs/contributing.md b/docs/contributing.md
index e67ea237..ba8fe371 100644
--- a/docs/contributing.md
+++ b/docs/contributing.md
@@ -1,378 +1,100 @@
 <a id="top"></a>
-
-> **Upstream history:** This page is retained from Catch2 for provenance and compatibility. It does not describe Catch3 release policy or Progmasoft support. See [Catch3 documentation](Readme.md#top) for current guidance.
-
-# Contributing to Catch2
+# Contributing to Catch3
 
 **Contents**<br>
-[Using Git(Hub)](#using-github)<br>
-[Testing your changes](#testing-your-changes)<br>
-[Writing documentation](#writing-documentation)<br>
-[Writing code](#writing-code)<br>
-[CoC](#coc)<br>
-[Using LLMs when contributing](#using-llms-when-contributing)<br>
-
-
-So you want to contribute something to Catch2? That's great! Whether it's
-a bug fix, a new feature, support for additional compilers - or just
-a fix to the documentation - all contributions are very welcome and very
-much appreciated. Of course so are bug reports, other comments, and
-questions, but generally it is a better idea to ask questions in our
-[Discord](https://discord.gg/4CWS9zD), than in the issue tracker.
-
-
-This page covers some guidelines and helpful tips for contributing
-to the codebase itself.
-
-## Using Git(Hub)
-
-Ongoing development happens in the `devel` branch for Catch2 v3, and in
-`v2.x` for maintenance updates to the v2 versions.
-
-Commits should be small and atomic. A commit is atomic when, after it is
-applied, the codebase, tests and all, still works as expected. Small
-commits are also preferred, as they make later operations with git history,
-whether it is bisecting, reverting, or something else, easier.
-
-_When submitting a pull request please do not include changes to the
-amalgamated distribution files. This means do not include them in your
-git commits!_
-
-When addressing review comments in a MR, please do not rebase/squash the
-commits immediately. Doing so makes it harder to review the new changes,
-slowing down the process of merging a MR. Instead, when addressing review
-comments, you should append new commits to the branch and only squash
-them into other commits when the MR is ready to be merged. We recommend
-creating new commits with `git commit --fixup` (or `--squash`) and then
-later squashing them with `git rebase --autosquash` to make things easier.
+[Where to start](#where-to-start)<br>
+[Building and testing](#building-and-testing)<br>
+[Two parts, two sets of rules](#two-parts-two-sets-of-rules)<br>
+[Tests](#tests)<br>
+[Documentation](#documentation)<br>
+[Code of Conduct](#code-of-conduct)<br>
 
+Progmasoft maintains Catch3. Issues and pull requests are welcome on
+[Progmasoft/catch3](https://github.com/Progmasoft/catch3); pull requests go
+to the `devel` branch. Report security problems privately, as described in
+[SECURITY.md](../SECURITY.md), not in a public issue.
 
 
-## Testing your changes
+## Where to start
 
-_Note: Running Catch2's tests requires Python3_
+Open an issue before a large change, so that the direction can be agreed
+first. A pull request should do one thing, say why in its description and
+come with the tests that show it works.
 
 
-C