From 091e83d6a6f4ad0e5528c1ca9225c9609ac425c0 Mon Sep 17 00:00:00 2001 From: Bryce Kwon Date: Sat, 31 Oct 2026 14:50:19 -0700 Subject: Write five compound terms one way in the docs Each takes the form its option name or most of the prose already uses, as in case-sensitive-sort and side-by-side-diffs. --- MANUAL.txt | 14 +++++++------- README.txt | 6 +++--- custom/cgitrc | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/MANUAL.txt b/MANUAL.txt index 5d5c790..3914218 100644 --- a/MANUAL.txt +++ b/MANUAL.txt @@ -93,7 +93,7 @@ cache-summary-ttl:: "The cache". case-sensitive-sort:: - Sort items in the repository list case sensitively. Default value: "1". + Sort items in the repository list case-sensitively. Default value: "1". See also: "repository-sort", "section-sort". clone-prefix:: @@ -309,8 +309,8 @@ header:: verbatim at the top of all pages. Default value: none. include:: - Name of a configfile to include before the rest of the current - configfile is parsed. Includes may nest eight levels deep, and anything + Name of a config file to include before the rest of the current + config file is parsed. Includes may nest eight levels deep, and anything deeper is ignored. Default value: none. See also: "Macro expansion". js:: @@ -403,9 +403,9 @@ mimetype.:: "mimetype-file". module-link:: - Text which will be used as the formatstring for a hyperlink when a + Text which will be used as the format string for a hyperlink when a submodule is printed in a directory listing. The arguments for the - formatstring are the name of the submodule directory and the object id + format string are the name of the submodule directory and the object id of the submodule commit. Default value: none. project-list:: @@ -676,9 +676,9 @@ repo.module-link:: Override the default module-link. Default value: . repo.module-link.:: - Text which will be used as the formatstring for a hyperlink when a + Text which will be used as the format string for a hyperlink when a submodule with the specified subdirectory path is printed in a directory - listing. The only argument for the formatstring is the object id of the + listing. The only argument for the format string is the object id of the submodule commit. Default value: none. repo.name:: diff --git a/README.txt b/README.txt index 7719a04..65ced13 100644 --- a/README.txt +++ b/README.txt @@ -91,7 +91,7 @@ script added through the css and js options has stable hooks to work with. ext- followed by the file extension. * The commit and tag pages use table.commit-info, the trailer table is table.commit-trailers, the diffstat is table.diffstat and each file of a diff - is div.file, or tbody.file in the side by side view, with the path in + is div.file, or tbody.file in the side-by-side view, with the path in data-path. The blob and blame pages open with div.blob-header. * Relative ages are time elements with an age-* class and the timestamp in data-ut, while a date shown in full is a plain time element. Line numbers are @@ -185,8 +185,8 @@ one, where a value of all marks the few not tied to particular pages. | s | index | sort key for the listing | | showmsg | log | show full commit messages | | period | stats | the statistics window, one of w, m, q or y | -| dt | diff commit | 0 unified, 1 side by side or 2 stat only | -| ss | diff commit | shorthand for the side by side diff | +| dt | diff commit | 0 unified, 1 side-by-side or 2 stat only | +| ss | diff commit | shorthand for the side-by-side diff | | all | atom | include every ref rather than one branch | | context | diff commit | lines of context around a diff hunk | | ignorews | diff commit | ignore whitespace when diffing | diff --git a/custom/cgitrc b/custom/cgitrc index 3930229..f761db2 100644 --- a/custom/cgitrc +++ b/custom/cgitrc @@ -138,8 +138,8 @@ section-from-path=0 # scan-path. Values are 0 or 1. Default is 0. remove-suffix=0 -# File listing subdirs of scan-path to load. Must precede scan-path. Value is a -# filesystem path that may use macros. Default is none. +# File listing subdirectories of scan-path to load. Must precede scan-path. +# Value is a filesystem path that may use macros. Default is none. #project-list=/var/lib/git/projects.list # Serve a repository only if this file exists inside it. Emulates gitweb -- cgit