diff options
author | Rémi Verschelde <rverschelde@gmail.com> | 2022-11-02 22:36:31 +0100 |
---|---|---|
committer | Rémi Verschelde <rverschelde@gmail.com> | 2022-11-02 22:36:31 +0100 |
commit | efefd9b198d09149e38423f4929207e2882f631e (patch) | |
tree | ee6022184aa833100ab357290114fe7f921e6299 /main | |
parent | b509d1665283133902636d8d83b64a7a24b303b5 (diff) | |
parent | f7c611ab71d292d64a6d4db8db8e36aaf0e2330b (diff) |
Merge pull request #68120 from akien-mga/style-doc-cleanup
Style: Misc docs and comment style and language fixes
Diffstat (limited to 'main')
-rw-r--r-- | main/main.cpp | 2 | ||||
-rw-r--r-- | main/main.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/main/main.cpp b/main/main.cpp index 2a08b03b96..ffd6e6f2dd 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -620,7 +620,7 @@ int Main::test_entrypoint(int argc, char *argv[], bool &tests_need_run) { * - setup(execpath, argc, argv, p_second_phase) is the main entry point for all platforms, * responsible for the initialization of all low level singletons and core types, and parsing * command line arguments to configure things accordingly. - * If p_second_phase is true, it will chain into setup2() (default behaviour). This is + * If p_second_phase is true, it will chain into setup2() (default behavior). This is * disabled on some platforms (Android, iOS, UWP) which trigger the second step in their * own time. * diff --git a/main/main.h b/main/main.h index f0bfe69b34..1e8c4f288b 100644 --- a/main/main.h +++ b/main/main.h @@ -76,7 +76,7 @@ public: static void cleanup(bool p_force = false); }; -// Test main override is for the testing behaviour. +// Test main override is for the testing behavior. #define TEST_MAIN_OVERRIDE \ bool run_test = false; \ int return_code = Main::test_entrypoint(argc, argv, run_test); \ |