Skip to content

Commit 9754b0a

Browse files
committed
sideband: conditional documentation fix
Duplicate a bit of text on either side of the ifdef/ifndef conditional documentation in order to avoid "sentence assembly" that does not fit well with translations, taking hint from the discussion on a recent topic. cf. https://lore.kernel.org/git/ff86f877-4b75-403d-a5a4-10ab528a9691@free.fr/ Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent c372fe2 commit 9754b0a

1 file changed

Lines changed: 3 additions & 2 deletions

File tree

Documentation/config/sideband.adoc

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,15 @@ sideband.allowControlCharacters::
22
ifdef::with-breaking-changes[]
33
By default, control characters that are delivered via the sideband
44
are masked, except ANSI color sequences. This prevents potentially
5+
unwanted ANSI escape sequences from being sent to the terminal.
56
endif::with-breaking-changes[]
67
ifndef::with-breaking-changes[]
78
By default, no control characters delivered via the sideband
89
are masked. This is unsafe and will change in Git v3.* to only
910
allow ANSI color sequences by default, preventing potentially
11+
unwanted ANSI escape sequences from being sent to the terminal.
1012
endif::with-breaking-changes[]
11-
unwanted ANSI escape sequences from being sent to the terminal. Use
12-
this config setting to override this behavior (the value can be
13+
Use this config setting to override this behavior (the value can be
1314
a comma-separated list of the following keywords):
1415
+
1516
--

0 commit comments

Comments
 (0)