From a2c24eafc7d15476a2a4c475a01c0aa523655a2c Mon Sep 17 00:00:00 2001 From: Carl Peto Date: Wed, 22 Oct 2025 14:55:56 +0100 Subject: [PATCH 1/4] Fix a few small discrepancies in the docs about options for backtrace. --- docs/Backtracing.rst | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/docs/Backtracing.rst b/docs/Backtracing.rst index ef24df70c88c5..5a6aac702c1dd 100644 --- a/docs/Backtracing.rst +++ b/docs/Backtracing.rst @@ -44,12 +44,13 @@ follows: | Key | Default | Meaning | +=================+=========+==================================================+ | enable | yes* | Set to ``no`` to disable crash catching, or | -| | | ``tty`` to enable only if stdin is a terminal. | +| | | ``tty`` to enable only if stdout is a terminal. | +-----------------+---------+--------------------------------------------------+ | demangle | yes | Set to ``no`` to disable demangling. | +-----------------+---------+--------------------------------------------------+ | interactive | tty | Set to ``no`` to disable interaction, or ``yes`` | -| | | to enable always. | +| | | to enable always. `tty`` to enable only if | +| | | stdin and stdout are are both a terminal. | +-----------------+---------+--------------------------------------------------+ | color | tty | Set to ``yes`` to enable always, or ``no`` to | | | | disable. Uses ANSI escape sequences. | @@ -95,7 +96,7 @@ follows: | format | text | Set to ``json`` to output JSON crash logs rather | | | | than plain text. | +-----------------+---------+--------------------------------------------------+ -| output-to | stdout | Set to ``stderr`` to send the backtrace to the | +| output-to | stderr | Set to ``stderr`` to send the backtrace to the | | | | standard error instead of standard output. This | | | | may be useful in some CI systems. | | | | | @@ -118,7 +119,7 @@ follows: | | | sometimes useful for testing. | +-----------------+---------+--------------------------------------------------+ -(*) On macOS, this defaults to ``no`` rather than ``yes``. +(*) On macOS, this defaults to ``tty`` rather than ``yes``. Backtrace limits ---------------- From fdbbf31d04b6dcb73a7159df8fc98b7d9005297b Mon Sep 17 00:00:00 2001 From: Carl Peto Date: Tue, 28 Oct 2025 21:52:14 +0000 Subject: [PATCH 2/4] Update docs/Backtracing.rst Co-authored-by: Alastair Houghton --- docs/Backtracing.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/Backtracing.rst b/docs/Backtracing.rst index 5a6aac702c1dd..de7533c27240a 100644 --- a/docs/Backtracing.rst +++ b/docs/Backtracing.rst @@ -96,8 +96,8 @@ follows: | format | text | Set to ``json`` to output JSON crash logs rather | | | | than plain text. | +-----------------+---------+--------------------------------------------------+ -| output-to | stderr | Set to ``stderr`` to send the backtrace to the | -| | | standard error instead of standard output. This | +| output-to | stderr | Set to ``stdout`` to send the backtrace to the | +| | | standard output instead of standard error. This | | | | may be useful in some CI systems. | | | | | | | | You may also specify a path; if this points at a | From 43c84ea6e67f19be8e155168704f9c05bcc32e2c Mon Sep 17 00:00:00 2001 From: Carl Peto Date: Tue, 28 Oct 2025 21:52:34 +0000 Subject: [PATCH 3/4] Update docs/Backtracing.rst Co-authored-by: Alastair Houghton --- docs/Backtracing.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/Backtracing.rst b/docs/Backtracing.rst index de7533c27240a..9497fa4499af9 100644 --- a/docs/Backtracing.rst +++ b/docs/Backtracing.rst @@ -49,8 +49,8 @@ follows: | demangle | yes | Set to ``no`` to disable demangling. | +-----------------+---------+--------------------------------------------------+ | interactive | tty | Set to ``no`` to disable interaction, or ``yes`` | -| | | to enable always. `tty`` to enable only if | -| | | stdin and stdout are are both a terminal. | +| | | to enable always, or `tty`` to enable only if | +| | | stdin and stdout are both a terminal. | +-----------------+---------+--------------------------------------------------+ | color | tty | Set to ``yes`` to enable always, or ``no`` to | | | | disable. Uses ANSI escape sequences. | From 825d82fe7953ef287f37887e972b774c21d137d2 Mon Sep 17 00:00:00 2001 From: Carl Peto Date: Tue, 28 Oct 2025 21:52:47 +0000 Subject: [PATCH 4/4] Update docs/Backtracing.rst Co-authored-by: Alastair Houghton --- docs/Backtracing.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/Backtracing.rst b/docs/Backtracing.rst index 9497fa4499af9..6da66df9c14ed 100644 --- a/docs/Backtracing.rst +++ b/docs/Backtracing.rst @@ -119,7 +119,8 @@ follows: | | | sometimes useful for testing. | +-----------------+---------+--------------------------------------------------+ -(*) On macOS, this defaults to ``tty`` rather than ``yes``. +(*) On macOS 26 and later, this defaults to ``tty`` rather than ``yes``. On + earlier versions, the default is ``no``. Backtrace limits ----------------