commit 634fd2c70672e347f54ce070d803309d87919157 from: Josiah Frentsos via: Thomas Adam date: Thu Nov 17 21:38:13 2022 UTC put manual page sections in the proper order commit - 2bb0ff1b00186ae89fbf42a85a4b757cee4e0d31 commit + 634fd2c70672e347f54ce070d803309d87919157 blob - 6366e38025c50b23e617cf0c76fb446fe33d9d79 blob + aa9b3bc75e1c1ccfc2c5c1bd4d071f31f27ab78b --- got/got.conf.5 +++ got/got.conf.5 @@ -262,8 +262,31 @@ block. .Ic port Ar port .It .Ic branch Brq Ar branch ... +.El .El .El +.Sh FILES +.Bl -tag -width Ds -compact +.It Pa got.conf +If present, +.Nm +located in the root directory of a Git repository supersedes any relevant +settings in Git's +.Pa config +file. +.Pp +.It Pa .got/got.conf +If present, +.Nm +located in the +.Pa .got +meta-data directory of a +.Xr got 1 +work tree supersedes any relevant settings in the repository's +.Nm +configuration file and Git's +.Pa config +file. .El .Sh EXAMPLES Configure author information: @@ -305,29 +328,6 @@ remote "origin" { } } .Ed -.Sh FILES -.Bl -tag -width Ds -compact -.It Pa got.conf -If present, -.Nm -located in the root directory of a Git repository supersedes any relevant -settings in Git's -.Pa config -file. -.Pp -.It Pa .got/got.conf -If present, -.Nm -located in the -.Pa .got -meta-data directory of a -.Xr got 1 -work tree supersedes any relevant settings in the repository's -.Nm -configuration file and Git's -.Pa config -file. -.El .Sh SEE ALSO .Xr got 1 , .Xr git-repository 5 , blob - d1056ee45db9e7d5294040b6585e57797ed9ffcf blob + b9dd2b0786d5a06a4c43e97bf29aeab25650d68d --- gotweb/gotweb.conf.5 +++ gotweb/gotweb.conf.5 @@ -91,6 +91,13 @@ Toggle display of the site owner. .It Ic got_www_path Ar string Set the public gotweb httpd path. .El +.Sh FILES +.Bl -tag -width Ds -compact +.It Pa /var/www/etc/gotweb.conf +Location of the +.Nm +configuration file. +.El .Sh EXAMPLES These are the currently configurable items for .Xr gotweb 8 @@ -123,13 +130,6 @@ got_logo_url "https://gameoftrees.org" #got_show_repo_description no #got_show_repo_cloneurl off .Ed -.Sh FILES -.Bl -tag -width Ds -compact -.It Pa /var/www/etc/gotweb.conf -Location of the -.Nm -configuration file. -.El .Sh SEE ALSO .Xr got 1 , .Xr gotweb 8 blob - 3b21405e0c045479879c333d2f5fd060bf11b6e6 blob + 01c8170c3db2fb2b5da5efcd0b964950e090f73f --- gotwebd/gotwebd.conf.5 +++ gotwebd/gotwebd.conf.5 @@ -171,6 +171,13 @@ Enable or disable use of unix sockets. .It Ic unix_socket_name Ar path Set the path to the unix socket used by the server. .El +.Sh FILES +.Bl -tag -width Ds -compact +.It Pa /etc/gotwebd.conf +Default location of the +.Nm +configuration file. +.El .Sh EXAMPLES These are the currently configurable items for .Xr gotwebd 8 @@ -216,13 +223,6 @@ server "localhost-unix" { # listen on ::1 port 9000 #} .Ed -.Sh FILES -.Bl -tag -width Ds -compact -.It Pa /etc/gotwebd.conf -Default location of the -.Nm -configuration file. -.El .Sh SEE ALSO .Xr got 1 , .Xr httpd.conf 5 ,