Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion core/sanitizer/SanitizerSetup.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
4 changes: 2 additions & 2 deletions tree/ntuple/src/RMiniFile.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -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];
Expand Down Expand Up @@ -224,7 +224,7 @@ struct RTFKey {
{
R__ASSERT(szObjInMem <= std::numeric_limits<std::uint32_t>::max());
R__ASSERT(szObjOnDisk <= std::numeric_limits<std::uint32_t>::max());
// For writing, we alywas 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<RUInt16BE>(GetHeaderSize() + clName.GetSize() + objName.GetSize() + titleName.GetSize());
Expand Down