Skip to content

Commit 10d3d5c

Browse files
authored
Merge branch 'master' into ghc-9.8
2 parents f39bd11 + d644b79 commit 10d3d5c

File tree

3 files changed

+11
-5
lines changed

3 files changed

+11
-5
lines changed

cabal-install/src/Distribution/Client/ProjectBuilding.hs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -672,9 +672,9 @@ rebuildTargets
672672
info verbosity $
673673
"Executing install plan "
674674
++ case buildSettingNumJobs of
675-
NumJobs n -> " in parallel using " ++ show n ++ " threads."
676-
UseSem n -> " in parallel using a semaphore with " ++ show n ++ " slots."
677-
Serial -> " serially."
675+
NumJobs n -> "in parallel using " ++ show n ++ " threads."
676+
UseSem n -> "in parallel using a semaphore with " ++ show n ++ " slots."
677+
Serial -> "serially."
678678

679679
createDirectoryIfMissingVerbose verbosity True distBuildRootDirectory
680680
createDirectoryIfMissingVerbose verbosity True distTempDirectory

changelog.d/pr-9376

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
synopsis: Avoid a double space in "Executing install plan ..."
2+
description:
3+
The "Executing·install·plan··serially" and other similar "Executing install
4+
plan··..." outputs no longer contain double spaces.
5+
packages: cabal-install
6+
prs: #9376

doc/conf.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,8 @@
102102
# Output file base name for HTML help builder.
103103
htmlhelp_basename = 'CabalUsersGuide'
104104

105-
# MathJax to use SVG rendering by default
106-
mathjax_path = 'https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/latest.js?config=TeX-AMS-MML_SVG'
105+
# MathJax to use HTML rendering by default (makes the text selectable, see #8453)
106+
mathjax_path = 'https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/latest.js?config=TeX-AMS_CHTML'
107107

108108

109109
# -- Options for LaTeX output ---------------------------------------------

0 commit comments

Comments
 (0)