From mboxrd@z Thu Jan 1 00:00:00 1970 From: mailings at hupie.com (Ferry Huberts) Date: Wed, 21 Mar 2012 08:12:45 +0100 Subject: [PATCH 1/8] cgitrc.5.txt: move deprecated options In-Reply-To: <1332292077-9709-2-git-send-email-jamie.couture@gmail.com> References: <1332292077-9709-1-git-send-email-jamie.couture@gmail.com> <1332292077-9709-2-git-send-email-jamie.couture@gmail.com> Message-ID: <4F697F6D.5070209@hupie.com> On 21-03-12 02:07, Jamie Couture wrote: > Create a section for deprecated options. Avoid cluttering manual with > ignored options. > > Signed-off-by: Jamie Couture Reviewed-by: Ferry Huberts > --- > cgitrc.5.txt | 47 ++++++++++++++++++++++++++--------------------- > 1 file changed, 26 insertions(+), 21 deletions(-) > > diff --git a/cgitrc.5.txt b/cgitrc.5.txt > index a72241f..971d960 100644 > --- a/cgitrc.5.txt > +++ b/cgitrc.5.txt > @@ -168,18 +168,6 @@ include:: > Name of a configfile to include before the rest of the current config- > file is parsed. Default value: none. See also: "MACRO EXPANSION". > > -index-header:: > - The content of the file specified with this option will be included > - verbatim above the repository index. This setting is deprecated, and > - will not be supported by cgit-1.0 (use root-readme instead). Default > - value: none. > - > -index-info:: > - The content of the file specified with this option will be included > - verbatim below the heading on the repository index page. This setting > - is deprecated, and will not be supported by cgit-1.0 (use root-desc > - instead). Default value: none. > - > local-time:: > Flag which, if set to "1", makes cgit print commit and tag times in the > servers timezone. Default value: "0". > @@ -243,11 +231,6 @@ module-link:: > formatstring are the path and SHA1 of the submodule commit. Default > value: none. > > -nocache:: > - If set to the value "1" caching will be disabled. This settings is > - deprecated, and will not be honored starting with cgit-1.0. Default > - value: "0". > - > noplainemail:: > If set to "1" showing full author email adresses will be disabled. > Default value: "0". > @@ -276,10 +259,6 @@ renamelimit:: > "-1" uses the compiletime value in git (for further info, look at > `man git-diff`). Default value: "-1". > > -repo.group:: > - Legacy alias for "section". This option is deprecated and will not be > - supported in cgit-1.0. > - > robots:: > Text used as content for the "robots" meta-tag. Default value: > "index, nofollow". > @@ -474,6 +453,32 @@ repo.url:: > setting specified for each repo. Default value: none. > > > +DEPRECATED OPTIONS > +------------------ > + > +index-header:: > + The content of the file specified with this option will be included > + verbatim above the repository index. This setting is deprecated, and > + will not be supported by cgit-1.0 (use root-readme instead). Default > + value: none. > + > +index-info:: > + The content of the file specified with this option will be included > + verbatim below the heading on the repository index page. This setting > + is deprecated, and will not be supported by cgit-1.0 (use root-desc > + instead). Default value: none. > + > +nocache:: > + If set to the value "1" caching will be disabled. This settings is > + deprecated, and will not be honored starting with cgit-1.0. Default > + value: "0". > + > +repo.group:: > + Legacy alias for "section". This option is deprecated and will not be > + supported in cgit-1.0. > + > + > + > REPOSITORY-SPECIFIC CGITRC FILE > ------------------------------- > When the option "scan-path" is used to auto-discover git repositories, cgit -- Ferry Huberts