From e2f62b093905384f25a39be6fead3bb11c91e245 Mon Sep 17 00:00:00 2001 From: Danilo Piparo Date: Thu, 25 Jun 2026 13:28:07 +0200 Subject: [PATCH 1/2] [nfc] Correct various typos --- CONTRIBUTING.md | 6 +++--- core/sanitizer/SanitizerSetup.cxx | 2 +- tree/ntuple/src/RMiniFile.cxx | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 6d1c23d6c1f2d..e1991b945de41 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -4,7 +4,7 @@ Thank you for your interest in contributing to ROOT! We strongly welcome and ap This short guide tries to make contributing as quick and painless as possible. > [!NOTE] -> These guidelines should be applicable to most contributes. At the same time, these are not 'one-size-fits-all' rules, +> These guidelines should be applicable to most contributions. At the same time, these are not 'one-size-fits-all' rules, > and there might be cases where diverging from these guidelines is warranted. If you are unsure about how to structure > your contribution, don't hesitate to reach out! We are always happy to provide help and feedback. @@ -43,11 +43,11 @@ This allows us to revert changes when needed, without affecting anything else. > [!TIP] > Enable the CMake build option `dev=ON` to enable extra checks that are normally off. Most notably, this will turn -> compiler warnings into errors, preventing you from accidentally push code that causes warnings. +> compiler warnings into errors, preventing you from accidentally pushing code that causes warnings. ### Your Commit Message -The commit summary (i.e. the first line of the commit message) should be preceded by the a tag indicating the scope of +The commit summary (i.e. the first line of the commit message) should be preceded by a tag indicating the scope of ROOT that is affected by your commit, in square brackets. Most tags are self-describing (e.g., `[tree]` indicates a change to TTree, `[RF]` indicates a change to RooFit). If you are unsure about which scope tags to use, we are happy to point you in the right direction! See also the [commit log](https://github.com/root-project/root/commits/master/) for diff --git a/core/sanitizer/SanitizerSetup.cxx b/core/sanitizer/SanitizerSetup.cxx index edfd8e3af46a8..a638ccae054f5 100644 --- a/core/sanitizer/SanitizerSetup.cxx +++ b/core/sanitizer/SanitizerSetup.cxx @@ -35,7 +35,7 @@ const char* __asan_default_options() { } /// Default options when leak sanitizer starts up in ROOT executables. -/// This is relevant when ROOT's build options `asan` is on. +/// This is relevant when ROOT's build option `asan` is on. /// These can be overridden / augmented by the LSAN_OPTIONS environment variable. /// Using LSAN_OPTIONS=help=1 and starting an instrumented ROOT executable, available options will be printed. const char* __lsan_default_options() { diff --git a/tree/ntuple/src/RMiniFile.cxx b/tree/ntuple/src/RMiniFile.cxx index 3c0faf499cb42..4d633a567ee9f 100644 --- a/tree/ntuple/src/RMiniFile.cxx +++ b/tree/ntuple/src/RMiniFile.cxx @@ -161,7 +161,7 @@ class RUInt64BE { }; #pragma pack(push, 1) -/// A name (type, identifies, ...) in the TFile binary format +/// A name (type, identifier, ...) in the TFile binary format struct RTFString { unsigned char fLName{0}; char fData[255]; @@ -224,7 +224,7 @@ struct RTFKey { { R__ASSERT(szObjInMem <= std::numeric_limits::max()); R__ASSERT(szObjOnDisk <= std::numeric_limits::max()); - // For writing, we alywas produce "big" keys with 64-bit SeekKey and SeekPdir. + // For writing, we alyways produce "big" keys with 64-bit SeekKey and SeekPdir. fVersion = fVersion + kBigKeyVersion; fObjLen = szObjInMem; fKeyLen = static_cast(GetHeaderSize() + clName.GetSize() + objName.GetSize() + titleName.GetSize()); From b3286fa630e1da6c8755966632c8739e189c25b8 Mon Sep 17 00:00:00 2001 From: Danilo Piparo Date: Thu, 25 Jun 2026 16:50:36 +0200 Subject: [PATCH 2/2] Update tree/ntuple/src/RMiniFile.cxx Co-authored-by: Silverweed <7806878+silverweed@users.noreply.github.com> --- tree/ntuple/src/RMiniFile.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tree/ntuple/src/RMiniFile.cxx b/tree/ntuple/src/RMiniFile.cxx index 4d633a567ee9f..5eb0abf6aad74 100644 --- a/tree/ntuple/src/RMiniFile.cxx +++ b/tree/ntuple/src/RMiniFile.cxx @@ -224,7 +224,7 @@ struct RTFKey { { R__ASSERT(szObjInMem <= std::numeric_limits::max()); R__ASSERT(szObjOnDisk <= std::numeric_limits::max()); - // For writing, we alyways produce "big" keys with 64-bit SeekKey and SeekPdir. + // For writing, we always produce "big" keys with 64-bit SeekKey and SeekPdir. fVersion = fVersion + kBigKeyVersion; fObjLen = szObjInMem; fKeyLen = static_cast(GetHeaderSize() + clName.GetSize() + objName.GetSize() + titleName.GetSize());