{"thread":{"id":"28634","subject":"[PATCHv5/RFC 0/6] Moving gitweb documentation to manpages","startedAt":"2011-10-08T18:31:57Z","lastAt":"2011-10-11T18:16:09Z","messageCount":22,"participants":["Jakub Narebski","Junio C Hamano","Jonathan Nieder","Drew Northup"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"177241","messageId":"1318098723-12813-1-git-send-email-jnareb@gmail.com","threadId":"28634","inReplyTo":null,"subject":"[PATCHv5/RFC 0/6] Moving gitweb documentation to manpages","fromName":"Jakub Narebski","fromEmail":"jnareb@gmail.com","sentAt":"2011-10-08T18:31:57Z","receivedAt":"2011-10-08T18:31:57Z","isPatch":false,"sender":{"key":"jnareb@gmail.com","avatar":"https://avatars.githubusercontent.com/u/2706?v=4"},"body":"The original patch adding manpage for /etc/gitweb.conf was sent by\nDrew Northup (as can be seen from shortlog); I have added manpage for\ngitweb itself, inspired by his patch.  Unfortunately Drew doesn't\ncurrently have time to work on this patch (patch series), so that is\nwhy it is me resending this series (again).\n\nCompared to previous version\n\n  \"[PATCH/RFCv4 0/4] Moving gitweb documentation to manpages\"\n  http://thread.gmane.org/gmane.comp.version-control.git/181605\n\nit has much improved gitweb.conf.txt manpage, and \"Documentation:\nPreparation for gitweb manpages\" commit message, thanks to feedback\nprovided by Jonathan Nieder.\n\nNew in this series are patches 4 and 5, which add links to the newly\ncreated gitweb documentation and gitweb config variables from other\nmanpages, respectively.\n\nNote that only \"Documentation: Preparation for gitweb manpages\" (which\nis not strictly necessary) and \"gitweb: Add manpage for gitweb\" (which\ndidn't get as much review as \"gitweb: Add manpage for gitweb\nconfiguration files\" are still marked as RFC.\n\nI have checked that RPM generation of 'gitweb' package works correctly\nwrt. gitweb documentation.\n\nTable of contents:\n~~~~~~~~~~~~~~~~~~\n [PATCHv5/RFC 1/6] Documentation: Preparation for gitweb manpages\n [PATCHv5 2/6] gitweb: Add manpage for gitweb configuration files\n [PATCHv5/RFC 3/6] gitweb: Add manpage for gitweb\n [PATCHv5 4/6] Documentation: Link to gitweb(1) and \n   gitweb.conf(5) in other manpages\n [PATCHv5 5/6] Documentation: Add gitweb config variables to\n   git-config(1)\n [PATCHv5 6/6] gitweb: Add gitweb manpages to 'gitweb' package in\n   git.spec.in\n\nShortlog:\n~~~~~~~~~\nDrew Northup (1):\n  gitweb: Add manpage for gitweb configuration files\n\nJakub Narebski (5):\n  Documentation: Preparation for gitweb manpages\n  gitweb: Add manpage for gitweb\n  Documentation: Link to gitweb(1) and gitweb.conf(5) in other manpages\n  Documentation: Add gitweb config variables to git-config(1)\n  gitweb: Add gitweb manpages to 'gitweb' package in git.spec\n\nDiffstat:\n~~~~~~~~~\n Documentation/Makefile         |    7 +-\n Documentation/config.txt       |   17 +\n Documentation/git-instaweb.txt |    4 +\n Documentation/gitweb.conf.txt  |  875 ++++++++++++++++++++++++++++++++++++++++\n Documentation/gitweb.txt       |  703 ++++++++++++++++++++++++++++++++\n command-list.txt               |    1 +\n git.spec.in                    |    7 +\n gitweb/INSTALL                 |   94 +----\n gitweb/Makefile                |    7 +-\n gitweb/README                  |  411 +------------------\n 10 files changed, 1647 insertions(+), 479 deletions(-)\n create mode 100644 Documentation/gitweb.conf.txt\n create mode 100644 Documentation/gitweb.txt\n\n-- \n1.7.6\n"},{"id":"177242","messageId":"1318098723-12813-2-git-send-email-jnareb@gmail.com","threadId":"28634","inReplyTo":"1318098723-12813-1-git-send-email-jnareb@gmail.com","subject":"[PATCHv5/RFC 1/6] Documentation: Preparation for gitweb manpages","fromName":"Jakub Narebski","fromEmail":"jnareb@gmail.com","sentAt":"2011-10-08T18:31:58Z","receivedAt":"2011-10-08T18:31:58Z","isPatch":false,"sender":{"key":"jnareb@gmail.com","avatar":"https://avatars.githubusercontent.com/u/2706?v=4"},"body":"Gitweb documentation currently consists of gitweb/README, gitweb/INSTALL\nand comments in gitweb source code.  This is harder to find, use and\nbrowse than manpages (\"man gitweb\" or \"git help gitweb\") and HTML\ndocumentation (\"git help --web gitweb\").\n\nThe goal of the next two commits is to move documentation out of\ngitweb/README to gitweb.txt and gitweb.conf.txt manpages, reducing its\nsize 10x from around 500 to around 50 lines (two pages), and to move\ninformation not related directly to building and installing gitweb out\nof gitweb/INSTALL.\n\nThe idea is to have the gitweb manpage sources reside in AsciiDoc\nformat in the Documentation/ directory, like for gitk and git-gui.\nThis means that building git documentation (with \"make doc\") would\nalso build gitweb manpages.\n\nAn alternate solution would be to have gitweb documentation in the\ngitweb/ directory, perhaps in POD format (see perlpod(1)).\n\n\nThis patch adds infrastructure for easy generation of only\ngitweb-related manpages.  It adds a currently empty 'gitweb-doc'\ntarget to Documentation/Makefile, and a 'doc' proxy target to\ngitweb/Makefile.\n\nThis way to build only gitweb documentation in both 'man' and 'html'\nformats one can use\n\n  make -C gitweb doc\n\nor\n\n  cd gitweb; make doc\n\nThis somewhat follows the idea of 'full-svn-test' and 'gitweb-test' in\nt/Makefile.  Note also that with alternate solution, where source of\ngitweb manpages would reside in the gitweb/ directory, \"make doc\"\nwould invoke \"make -C gitweb doc\" to generate formatted docs.\n\nThe gitweb.conf(5) and gitweb(1) manpages will be added in subsequent\ncommits.\n\n[Commit message improved with help of Jonathan Nieder]\n\nSigned-off-by: Jakub Narebski <jnareb@gmail.com>\n---\nThis commit is not strictly necessary: it only adds \"doc\" target to\ngitweb/Makefile, and \"gitweb-doc\" target to Documentation/Makefile;\nneither is run when e.g. generating RPM.\n\nThey are here because they would be here if documentation source was\nkept along with gitweb script in the 'gitweb/' subdirectory, and to\nmake it easier and faster to test the changes.\n\n Documentation/Makefile |    3 +++\n gitweb/Makefile        |    7 ++++++-\n 2 files changed, 9 insertions(+), 1 deletions(-)\n\ndiff --git a/Documentation/Makefile b/Documentation/Makefile\nindex 6346a75..44be67b 100644\n--- a/Documentation/Makefile\n+++ b/Documentation/Makefile\n@@ -170,6 +170,9 @@ info: git.info gitman.info\n \n pdf: user-manual.pdf\n \n+GITWEB_DOC = $(filter gitweb.%,$(DOC_HTML) $(DOC_MAN1) $(DOC_MAN5) $(DOC_MAN7))\n+gitweb-doc: $(GITWEB_DOC)\n+\n install: install-man\n \n install-man: man\ndiff --git a/gitweb/Makefile b/gitweb/Makefile\nindex 1c85b5f..3014d80 100644\n--- a/gitweb/Makefile\n+++ b/gitweb/Makefile\n@@ -174,6 +174,11 @@ test-installed:\n \tGITWEB_TEST_INSTALLED='$(DESTDIR_SQ)$(gitwebdir_SQ)' \\\n \t\t$(MAKE) -C ../t gitweb-test\n \n+### Documentation\n+\n+doc:\n+\t$(MAKE) -C ../Documentation gitweb-doc\n+\n ### Installation rules\n \n install: all\n@@ -187,5 +192,5 @@ install: all\n clean:\n \t$(RM) gitweb.cgi static/gitweb.min.js static/gitweb.min.css GITWEB-BUILD-OPTIONS\n \n-.PHONY: all clean install test test-installed .FORCE-GIT-VERSION-FILE FORCE\n+.PHONY: all clean install test test-installed doc .FORCE-GIT-VERSION-FILE FORCE\n \n-- \n1.7.6\n"},{"id":"177243","messageId":"1318098723-12813-3-git-send-email-jnareb@gmail.com","threadId":"28634","inReplyTo":"1318098723-12813-1-git-send-email-jnareb@gmail.com","subject":"[PATCHv5 2/6] gitweb: Add manpage for gitweb configuration files","fromName":"Jakub Narebski","fromEmail":"jnareb@gmail.com","sentAt":"2011-10-08T18:31:59Z","receivedAt":"2011-10-08T18:31:59Z","isPatch":false,"sender":{"key":"jnareb@gmail.com","avatar":"https://avatars.githubusercontent.com/u/2706?v=4"},"body":"From: Drew Northup <drew.northup@maine.edu>\n\nMuch of what is in gitweb.conf.txt has been pulled directly from the\nREADME file of gitweb.  The manpage was supplemented with description\nof missing gitweb config variables, and with description of gitweb's\n%features.\n\nThere remains a bit of redundancy, which should be reduced if\npossible... but I think some of duplication of information is\ninevitable.\n\n[jn: Improved, extended, removed duplicate info from README]\n\nSigned-off-by: Drew Northup <drew.northup@maine.edu>\nSigned-off-by: Jakub Narebski <jnareb@gmail.com>\nHelped-by: Jonathan Nieder <jrnieder@gmail.com>\n---\nI refer to my reply to Jonathan Nieder in\n\n  Re: [PATCH/RFCv4 2/4] gitweb: Add manpage for /etc/gitweb.conf (for gitweb documentation)\n  http://thread.gmane.org/gmane.comp.version-control.git/181605/focus=181896\n\nfor description of changes (and to parent post).\n\nThanks a lot to Jonathan Nieder.\n\n Documentation/Makefile        |    2 +-\n Documentation/gitweb.conf.txt |  866 +++++++++++++++++++++++++++++++++++++++++\n gitweb/README                 |  133 +-------\n 3 files changed, 868 insertions(+), 133 deletions(-)\n create mode 100644 Documentation/gitweb.conf.txt\n\ndiff --git a/Documentation/Makefile b/Documentation/Makefile\nindex 44be67b..6d71943 100644\n--- a/Documentation/Makefile\n+++ b/Documentation/Makefile\n@@ -3,7 +3,7 @@ MAN1_TXT= \\\n \t\t$(wildcard git-*.txt)) \\\n \tgitk.txt git.txt\n MAN5_TXT=gitattributes.txt gitignore.txt gitmodules.txt githooks.txt \\\n-\tgitrepository-layout.txt\n+\tgitrepository-layout.txt gitweb.conf.txt\n MAN7_TXT=gitcli.txt gittutorial.txt gittutorial-2.txt \\\n \tgitcvs-migration.txt gitcore-tutorial.txt gitglossary.txt \\\n \tgitdiffcore.txt gitnamespaces.txt gitrevisions.txt gitworkflows.txt\ndiff --git a/Documentation/gitweb.conf.txt b/Documentation/gitweb.conf.txt\nnew file mode 100644\nindex 0000000..31eb527\n--- /dev/null\n+++ b/Documentation/gitweb.conf.txt\n@@ -0,0 +1,866 @@\n+gitweb.conf(5)\n+==============\n+\n+NAME\n+----\n+gitweb.conf - Gitweb (git web interface) configuration file\n+\n+SYNOPSIS\n+--------\n+/etc/gitweb.conf, /etc/gitweb-common.conf, $GITWEBDIR/gitweb_config.perl\n+\n+DESCRIPTION\n+-----------\n+\n+The gitweb CGI script for viewing Git repositories over the web uses a\n+perl script fragment as its configuration file.  You can set variables\n+using \"`our $variable = value`\"; text from a \"#\" character until the\n+end of a line is ignored.  See *perlsyn*(1) for details.\n+\n+An example:\n+\n+    # gitweb configuration file for http://git.example.org\n+    #\n+    our $projectroot = \"/srv/git\"; # FHS recommendation\n+    our $site_name = 'Example.org >> Repos';\n+\n+\n+The configuration file is used to override the default settings that\n+were built into gitweb at the time the 'gitweb.cgi' script was generated.\n+\n+While one could just alter the configuration settings in the gitweb\n+CGI itself, those changes would be lost upon upgrade.  Configuration\n+settings might also be placed into a file in the same directory as the\n+CGI script with the default name 'gitweb_config.perl' -- allowing\n+one to have multiple gitweb instances with different configurations by\n+the use of symlinks.\n+\n+\n+DISCUSSION\n+----------\n+Gitweb reads configuration data from the following sources in the\n+following order:\n+\n+ * built-in values (some set during build stage),\n+\n+ * common system-wide configuration file (defaults to\n+   '/etc/gitweb-common.conf'),\n+\n+ * either per-instance configuration file (defaults to 'gitweb_config.perl'\n+   in the same directory as the installed gitweb), or if it does not exists\n+   then fallback system-wide configuration file (defaults to '/etc/gitweb.conf').\n+\n+Values obtained in later configuration files override values obtained earlier\n+in the above sequence.\n+\n+Locations of the common system-wide configuration file, the fallback\n+system-wide configuration file and the per-instance configuration file\n+are defined at compile time using build-time Makefile configuration\n+variables, respectively `GITWEB_CONFIG_COMMON`, `GITWEB_CONFIG_SYSTEM`\n+and `GITWEB_CONFIG`.\n+\n+You can also override locations of gitweb configuration files during\n+runtime by setting the following environment variables:\n+`GITWEB_CONFIG_COMMON`, `GITWEB_CONFIG_SYSTEM` and `GITWEB_CONFIG`\n+to a non-empty value.\n+\n+\n+The syntax of the configuration files is that of Perl, since these files are\n+handled by sourcing them as fragments of Perl code (the language that\n+gitweb itself is written in). Variables are typically set using the\n+`our` qualifier (as in \"`our $variable = <value>;`\") to avoid syntax\n+errors if a new version of gitweb no longer uses a variable and therefore\n+stops declaring it.\n+\n+You can include other configuration file using read_config_file()\n+subroutine.  For example, one might want to put gitweb configuration\n+related to access control for viewing repositories via Gitolite (one\n+of git repository management tools) in a separate file, e.g. in\n+'/etc/gitweb-gitolite.conf'.  To include it, put\n+\n+--------------------------------------------------\n+read_config_file(\"/etc/gitweb-gitolite.conf\");\n+--------------------------------------------------\n+\n+somewhere in gitweb configuration file used, e.g. in per-installation\n+gitweb configuration file.  Note that read_config_file() checks itself\n+that the file it reads exists, and does nothing if it is not found.\n+It also handles errors in included file.\n+\n+\n+The default configuration with no configuration file at all may work\n+perfectly well for some installations.  Still, a configuration file is\n+useful for customizing or tweaking the behavior of gitweb in many ways, and\n+some optional features will not be present unless explicitly enabled using\n+the configurable `%features` variable (see also \"Configuring gitweb\n+features\" section below).\n+\n+\n+CONFIGURATION VARIABLES\n+-----------------------\n+Some configuration variables have their default values (embedded in the CGI\n+script) set during building gitweb -- if that is the case, this fact is put\n+in their description.  See gitweb's 'INSTALL' file for instructions on building\n+and installing gitweb.\n+\n+\n+Location of repositories\n+~~~~~~~~~~~~~~~~~~~~~~~~\n+The configuration variables described below control how gitweb finds\n+git repositories, and how repositories are displayed and accessed.\n+\n+$projectroot::\n+\tAbsolute filesystem path which will be prepended to project path;\n+\tthe path to repository is `$projectroot/$project`.  Set to\n+\t`$GITWEB_PROJECTROOT` during installation.  This variable has to be\n+\tset correctly for gitweb to find repositories.\n++\n+For example, if `$projectroot` is set to \"/srv/git\" by putting the following\n+in gitweb config file:\n++\n+----------------------------------------------------------------------------\n+our $projectroot = \"/srv/git\";\n+----------------------------------------------------------------------------\n++\n+then\n++\n+------------------------------------------------\n+http://git.example.com/gitweb.cgi?p=foo/bar.git\n+------------------------------------------------\n++\n+and its path_info based equivalent\n++\n+------------------------------------------------\n+http://git.example.com/gitweb.cgi/foo/bar.git\n+------------------------------------------------\n++\n+will map to the path '/srv/git/foo/bar.git' on the filesystem.\n+\n+$projects_list::\n+\tName of a plain text file listing projects, or a name of directory\n+\tto be scanned for projects.\n++\n+Project list files should list one project per line, with each line\n+having the following format\n++\n+-----------------------------------------------------------------------------\n+<URI-encoded filesystem path to repository> SP <URI-encoded repository owner>\n+-----------------------------------------------------------------------------\n++\n+The default value of this variable is determined by the `GITWEB_LIST`\n+makefile variable at installation time.  If this variable is empty, gitweb\n+will fall back to scanning the `$projectroot` directory for repositories.\n+\n+$project_maxdepth::\n+\tIf `$projects_list` variable is unset, gitweb will recursively\n+\tscan filesystem for git repositories.  The `$project_maxdepth`\n+\tis used to limit traversing depth, relative to `$projectroot`\n+\t(starting point); it means that directories which are further\n+\tfrom `$projectroot` than `$project_maxdepth` will be skipped.\n++\n+It is purely performance optimization, originally intended for MacOS X,\n+where recursive directory traversal is slow.  Gitweb follows symbolic\n+links, but it detects cycles, ignoring any duplicate files and directories.\n++\n+The default value of this variable is determined by the build-time\n+configuration variable `GITWEB_PROJECT_MAXDEPTH`, which defaults to\n+2007.\n+\n+$export_ok::\n+\tShow repository only if this file exists (in repository).  Only\n+\teffective if this variable evaluates to true.  Can be set when\n+\tbuilding gitweb by setting `GITWEB_EXPORT_OK`.  This path is\n+\trelative to `GIT_DIR`.  git-daemon[1] uses 'git-daemon-export-ok',\n+\tunless started with `--export-all`.  [No default / Not set\n+\t(this feature is turned off)]\n+\n+$export_auth_hook::\n+\tFunction used to determine which repositories should be shown.\n+\tThis subroutine should take one parameter, the full path to\n+\ta project, and if it returns true, that project will be included\n+\tin the projects list and can be accessed through gitweb as long\n+\tas it fulfills the other requirements described by $export_ok,\n+\t$projects_list, and $projects_maxdepth.  Example:\n++\n+----------------------------------------------------------------------------\n+our $export_auth_hook = sub { return -e \"$_[0]/git-daemon-export-ok\"; };\n+----------------------------------------------------------------------------\n++\n+though the above might be done by using `$export_ok` instead\n++\n+----------------------------------------------------------------------------\n+our $export_ok = \"git-daemon-export-ok\";\n+----------------------------------------------------------------------------\n++\n+If not set (default), it means that this feature is disabled.\n+\n+$strict_export::\n+\tOnly allow viewing of repositories also shown on the overview page.\n+\tThis for example makes `$gitweb_export_ok` file decide if repository is\n+\tavailable and not only if it is shown.  If `$gitweb_list` points to\n+\tfile with list of project, only those repositories listed would be\n+\tavailable for gitweb.  Can be set during building gitweb via\n+\t`GITWEB_STRICT_EXPORT`.  [No default / Not set (you can access\n+\trepositories hidden from projects list page)]\n+\n+\n+Finding files\n+~~~~~~~~~~~~~\n+The following configuration variables tell gitweb where to find files.\n+The values of these variables are paths on the filesystem.\n+\n+$GIT::\n+\tCore git executable to use.  By default set to `$GIT_BINDIR/git`, which\n+\tin turn is by default set to `$(bindir)/git`.  If you use git installed\n+\tfrom a binary package, you should usually set this to \"/usr/bin/git\".\n+\tThis can just be \"git\" if your web server has a sensible PATH; from\n+\tsecurity point of view it is better to use absolute path to git binary.\n+\tIf you have multiple git versions installed it can be used to choose\n+\twhich one to use.  Must be (correctly) set for gitweb to be able to\n+\twork.\n+\n+$mimetypes_file::\n+\tFile to use for (filename extension based) guessing of MIME types before\n+\ttrying '/etc/mime.types'.  *NOTE* that this path, if relative, is taken\n+\tas relative to the current git repository, not to CGI script.  If unset,\n+\tonly '/etc/mime.types' is used (if present on filesystem).  If no mimetypes\n+\tfile is found, mimetype guessing based on extension of file is disabled.\n+\t[Unset by default]\n+\n+$highlight_bin::\n+\tPath to the highlight executable to use (it must be the one from\n+\thttp://www.andre-simon.de due to assumptions about parameters and output).\n+\tUseful if 'highlight' is not installed on your web server's PATH.\n+\t[Default: 'highlight']\n++\n+*NOTE*: if you want to add support for new file type (supported by\n+\"highlight\" but not used by gitweb), you need to modify `%highlight_ext`\n+or `%highlight_basename`, depending on whether you detect type of file\n+based on extension (for example \"sh\") or on its basename (for example\n+\"Makefile\").  The keys of these hashes are extension and basename,\n+respectively, and value for given key is name of syntax to be passed via\n+`--syntax <syntax>` to highlighter.\n++\n+For example if repositories you are hosting use \"phtml\" extension for\n+PHP files, and you want to have correct syntax-highlighting for those\n+files, you can add the following to gitweb configuration:\n++\n+---------------------------------------------------------\n+our %highlight_ext;\n+$highlight_ext{'phtml'} = 'php';\n+---------------------------------------------------------\n+\n+\n+Links and their targets\n+~~~~~~~~~~~~~~~~~~~~~~~\n+The configuration variables described below configure some of gitweb links:\n+their target and their look (text or image), and where to find page\n+prerequisites (stylesheet, favicon, images, scripts).  Usually they are left\n+at their default values, with the possible exception of `@stylesheets`\n+variable.\n+\n+@stylesheets::\n+\tList of URIs of stylesheets (relative to the base URI of a page). You\n+\tmight specify more than one stylesheet, for example to use \"gitweb.css\"\n+\tas base with site specific modifications in a separate stylesheet\n+\tto make it easier to upgrade gitweb.  For example, you can add\n+\ta `site` stylesheet by putting\n++\n+----------------------------------------------------------------------------\n+push @stylesheets, \"gitweb-site.css\";\n+----------------------------------------------------------------------------\n++\n+in the gitweb config file.  Those values that are relative paths are\n+relative to base URI of gitweb.\n++\n+This list should contain the URI of gitweb's standard stylesheet.  The default\n+URI of gitweb stylesheet can be set at build time using the `GITWEB_CSS`\n+makefile variable.  Its default value is 'static/gitweb.css'\n+(or 'static/gitweb.min.css' if the `CSSMIN` variable is defined,\n+i.e. if CSS minifier is used during build).\n++\n+*Note*: there is also a legacy `$stylesheet` configuration variable, which was\n+used by older gitweb.  If `$stylesheet` variable is defined, only CSS stylesheet\n+given by this variable is used by gitweb.\n+\n+$logo::\n+\tPoints to the location where you put 'git-logo.png' on your web\n+\tserver, or to be more the generic URI of logo, 72x27 size).  This image\n+\tis displayed in the top right corner of each gitweb page and used as\n+\ta logo for the Atom feed.  Relative to the base URI of gitweb (as a path).\n+\tCan be adjusted when building gitweb using `GITWEB_LOGO` variable\n+\t[Default: 'static/git-logo.png']\n+\n+$favicon::\n+\tPoints to the location where you put 'git-favicon.png' on your web\n+\tserver, or to be more the generic URI of favicon, which will be served\n+\tas \"image/png\" type.  Web browsers that support favicons (website icons)\n+\tmay display them in the browser's URL bar and next to the site name in\n+\tbookmarks.  Relative to the base URI of gitweb.  Can be adjusted at\n+\tbuild time using `GITWEB_FAVICON` variable.\n+\t[Default: 'static/git-favicon.png']\n+\n+$javascript::\n+\tPoints to the location where you put 'gitweb.js' on your web server,\n+\tor to be more generic the URI of JavaScript code used by gitweb.\n+\tRelative to the base URI of gitweb.  Can be set at build time using\n+\tthe `GITWEB_JS` build-time configuration variable.\n++\n+The default value is either 'static/gitweb.js', or 'static/gitweb.min.js' if\n+the `JSMIN` build variable was defined, i.e. if JavaScript minifier was used\n+at build time.  *Note* that this single file is generated from multiple\n+individual JavaScript \"modules\".\n+\n+$home_link::\n+\tTarget of the home link on the top of all pages (the first part of view\n+\t\"breadcrumbs\").  By default it is set to the absolute URI of a current page\n+\t(to the value of `$my_uri` variable, or to \"/\" if `$my_uri` is undefined\n+\tor is an empty string).\n+\n+$home_link_str::\n+\tLabel for the \"home link\" at the top of all pages, leading to `$home_link`\n+\t(usually the main gitweb page, which contains the projects list).  It is\n+\tused as the first component of gitweb's \"breadcrumb trail\":\n+\t`<home link> / <project> / <action>`.  Can be set at build time using\n+\tthe `GITWEB_HOME_LINK_STR` variable.  [Default: \"projects\"]\n+\n+$logo_url::\n+$logo_label::\n+\tURI and label (title) for the Git logo link (or your site logo,\n+\tif you chose to use different logo image). By default, these both\n+\trefer to git homepage; in the past, they pointed to git documentation\n+\tat http://www.kernel.org[].\n+\n+\n+Changing gitweb's look\n+~~~~~~~~~~~~~~~~~~~~~~\n+You can adjust how pages generated by gitweb look using the variables described\n+below.  You can change the site name, add common headers and footers for all\n+pages, and add a description of this gitweb installation on its main page\n+(which is the projects list page), etc.\n+\n+$site_name::\n+\tName of your site or organization, to appear in page titles.  Set it\n+\tto something descriptive for clearer bookmarks etc.  If this variable\n+\tis not set or is, then gitweb uses the value of the `SERVER_NAME`\n+\tCGI environment variable, setting site name to \"$SERVER_NAME Git\",\n+\tor \"Untitled Git\" if this variable is not set (e.g. if running gitweb\n+\tas standalone script).\n++\n+Can be set using the `GITWEB_SITENAME` at build time.  [No default]\n+\n+$site_header::\n+\tName of a file with HTML to be included at the top of each page.\n+\tRelative to the directory containing the 'gitweb.cgi' script.\n+\tCan be set using `GITWEB_SITE_HEADER` at build time.  [No default]\n+\n+$site_footer::\n+\tName of a file with HTML to be included at the bottom of each page.\n+\tRelative to the directory containing the 'gitweb.cgi' script.\n+\tCan be set using `GITWEB_SITE_FOOTER` at build time.  [No default]\n+\n+$home_text::\n+\tName of a HTML file which, if it exists, is included on the\n+\tgitweb projects overview page (\"projects_list\" view).  Relative to\n+\tthe directory containing the gitweb.cgi script.  Default value\n+\tcan be adjusted during build time using `GITWEB_HOMETEXT` variable.\n+\t[Default: 'indextext.html']\n+\n+$projects_list_description_width::\n+\tThe width (in characters) of the \"Description\" column of the projects list.\n+\tLonger descriptions will be truncated (trying to cut at word boundary);\n+\tthe full description is available in the 'title' attribute (usually shown on\n+\tmouseover).  The default is 25, which might be too small if you\n+\tuse long project descriptions.\n+\n+$default_projects_order::\n+\tDefault value of ordering of projects on projects list page, which\n+\tmeans the ordering used if you don't explicitly sort projects list\n+\t(if there is no \"o\" CGI query parameter in the URL).  Valid values\n+\tare \"none\" (unsorted), \"project\" (projects are by project name,\n+\ti.e. path to repository relative to `$projectroot`), \"descr\"\n+\t(project description), \"owner\", and \"age\" (by date of most current\n+\tcommit).\n++\n+Default value is \"project\".  Unknown value means unsorted.\n+\n+\n+Changing gitweb's behavior\n+~~~~~~~~~~~~~~~~~~~~~~~~~~\n+These configuration variables control _internal_ gitweb behavior.\n+\n+$default_blob_plain_mimetype::\n+\tDefault mimetype for the blob_plain (raw) view, if mimetype checking\n+\tdoesn't result in some other type; by default \"text/plain\".\n+\tGitweb guesses mimetype of a file to display based on extension\n+\tof its filename, using `$mimetypes_file` (if set and file exists)\n+\tand '/etc/mime.types' files (see *mime.types*(5) manpage; only\n+\tfilename extension rules are supported by gitweb).\n+\n+$default_text_plain_charset::\n+\tDefault charset for text files. If this is not set, the web server\n+\tconfiguration will be used.  Unset by default.\n+\n+$fallback_encoding::\n+\tGitweb assumes this charset when a line contains non-UTF-8 characters.\n+\tThe fallback decoding is used without error checking, so it can be even\n+\t\"utf-8\". The value must be a valid encoding; see the *Encoding::Supported*(3pm)\n+\tman page for a list. The default is \"latin1\", aka. \"iso-8859-1\".\n+\n+@diff_opts::\n+\tRename detection options for git-diff and git-diff-tree. The default is\n+\t(\\'-M'); set it to (\\'-C') or (\\'-C', \\'-C') to also detect copies,\n+\tor set it to () i.e. empty list if you don't want to have renames\n+\tdetection.\n++\n+*Note* that rename and especially copy detection can be quite\n+CPU-intensive.  Note also that non git tools can have problems with\n+patches generated with options mentioned above, especially when they\n+involve file copies (\\'-C') or criss-cross renames (\\'-B').\n+\n+\n+Some optional features and policies\n+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n+Most of features are configured via `%feature` hash; however some of extra\n+gitweb features can be turned on and configured using variables described\n+below.  This list beside configuration variables that control how gitweb\n+looks does contain variables configuring administrative side of gitweb\n+(e.g. cross-site scripting prevention; admittedly this as side effect\n+affects how \"summary\" pages look like, or load limiting).\n+\n+@git_base_url_list::\n+\tList of git base URLs.  These URLs are used to generate URLs\n+\tdescribing from where to fetch a project, which are shown on\n+\tproject summary page.  The full fetch URL is \"`$git_base_url/$project`\",\n+\tfor each element of this list. You can set up multiple base URLs\n+\t(for example one for `git://` protocol, and one for `http://`\n+\tprotocol).\n++\n+Note that per repository configuration can be set in '$GIT_DIR/cloneurl'\n+file, or as values of multi-value `gitweb.url` configuration variable in\n+project config.  Per-repository configuration takes precedence over value\n+composed from `@git_base_url_list` elements and project name.\n++\n+You can setup one single value (single entry/item in this list) at build\n+time by setting the `GITWEB_BASE_URL` built-time configuration variable.\n+[Default: (), i.e. empty list]\n+\n+$projects_list_group_categories::\n+\tWhether to enables the grouping of projects by category on the project\n+\tlist page. The category of a project is determined by the\n+\t`$GIT_DIR/category` file or the `gitweb.category` variable in each\n+\trepository's configuration.  [Disabled by default].\n+\n+$project_list_default_category::\n+\tDefault category for projects for which none is specified.  If this is\n+\tset to the empty string, such projects will remain uncategorized and\n+\tlisted at the top, above categorized projects.  Used only if project\n+\tcategories are enabled, which means if `$projects_list_group_categories`\n+\tis true.  [Default: \"\" (empty string)]\n+\n+$prevent_xss::\n+\tIf true, some gitweb features are disabled to prevent content in\n+\trepositories from launching cross-site scripting (XSS) attacks.  Set this\n+\tto true if you don't trust the content of your repositories.\n+\t[Default: false].\n+\n+$maxload::\n+\tUsed to set the maximum load that we will still respond to gitweb queries.\n+\tIf the server load exceeds this value then gitweb will return\n+\t\"503 Service Unavailable\" error.  The server load is taken to be 0\n+\tif gitweb cannot determine its value.  Currently it works only on Linux,\n+\twhere it uses '/proc/loadavg'; the load there is the number of active\n+\ttasks on the system -- processes that are actually running -- averaged\n+\tover the last minute.\n++\n+Set `$maxload` to undefined value (`undef`) to turn this feature off.\n+[Default: 300]\n+\n+$per_request_config::\n+\tIf this is set to code reference, it will be run once for each request.\n+\tYou can\tset parts of configuration that change per session this way.\n+\tFor example, one might use the following code in a gitweb configuration\n+\tfile\n++\n+--------------------------------------------------------------------------------\n+our $per_request_config = sub {\n+\t$ENV{GL_USER} = $cgi->remote_user || \"gitweb\";\n+};\n+--------------------------------------------------------------------------------\n++\n+If `$per_request_config` is not a code reference, it is interpreted as boolean\n+value.  If it is true gitweb will process config files once per request,\n+and if it is false gitweb will process config files only once, each time it\n+is executed.  [Default: true]\n++\n+*NOTE*: `$my_url`, `$my_uri`, and `$base_url` are overwritten with their default\n+values before every request, so if you want to change them, be sure to set\n+this variable to true or a code reference effecting the desired changes.\n++\n+This variable matters only when using persistent web environments that\n+serve multiple requests using single gitweb instance, like mod_perl,\n+FastCGI or Plackup.\n+\n+\n+Other variables\n+~~~~~~~~~~~~~~~\n+Usually you should not need to change (adjust) any of configuration\n+variables described below; they should be automatically set by gitweb to\n+correct value.\n+\n+\n+$version::\n+\tGitweb version, set automatically when creating gitweb.cgi from\n+\tgitweb.perl. You might want to modify it if you are running modified\n+\tgitweb, for example\n++\n+---------------------------------------------------\n+our $version .= \" with caching\";\n+---------------------------------------------------\n++\n+if you run modified version of gitweb with caching support.  This variable\n+is purely informational, used e.g. in the \"generator\" meta header in HTML\n+header.\n+\n+$my_url::\n+$my_uri::\n+\tFull URL and absolute URL of the gitweb script;\n+\tin earlier versions of gitweb you might have need to set those\n+\tvariables, but now there should be no need to do it.  See\n+\t`$per_request_config` if you need to set them still.\n+\n+$base_url::\n+\tBase URL for relative URLs in pages generated by gitweb,\n+\t(e.g. `$logo`, `$favicon`, `@stylesheets` if they are relative URLs),\n+\tneeded and used '<base href=\"$base_url\">' only for URLs with nonempty\n+\tPATH_INFO.  Usually gitweb sets its value correctly,\n+\tand there is no need to set this variable, e.g. to $my_uri or \"/\".\n+\tSee `$per_request_config` if you need to override it anyway.\n+\n+\n+CONFIGURING GITWEB FEATURES\n+---------------------------\n+Many gitweb features can be enabled (or disabled) and configured using the\n+`%feature` hash.  Names of gitweb features are keys of this hash.\n+\n+Each `%feature` hash element is a hash reference and has the following\n+structure:\n+----------------------------------------------------------------------\n+\"<feature_name>\" => {\n+\t\"sub\" => <feature-sub (subroutine)>,\n+\t\"override\" => <allow-override (boolean)>,\n+\t\"default\" => [ <options>... ]\n+},\n+----------------------------------------------------------------------\n+Some features cannot be overridden per project.  For those\n+features the structure of appropriate `%feature` hash element has a simpler\n+form:\n+----------------------------------------------------------------------\n+\"<feature_name>\" => {\n+\t\"override\" => 0,\n+\t\"default\" => [ <options>... ]\n+},\n+----------------------------------------------------------------------\n+As one can see it lacks the \\'sub' element.\n+\n+The meaning of each part of feature configuration is described\n+below:\n+\n+default::\n+\tList (array reference) of feature parameters (if there are any),\n+\tused also to toggle (enable or disable) given feature.\n++\n+Note that it is currently *always* an array reference, even if\n+feature doesn't accept any configuration parameters, and \\'default'\n+is used only to turn it on or off.  In such case you turn feature on\n+by setting this element to `[1]`, and torn it off by setting it to\n+`[0]`.  See also the passage about the \"blame\" feature in the \"Examples\"\n+section.\n++\n+To disable features that accept parameters (are configurable), you\n+need to set this element to empty list i.e. `[]`.\n+\n+override::\n+\tIf this field has a true value then the given feature is\n+\toverriddable, which means that it can be configured\n+\t(or enabled/disabled) on a per-repository basis.\n++\n+Usually given \"<feature>\" is configurable via the `gitweb.<feature>`\n+config variable in the per-repository git configuration file.\n++\n+*Note* that no feature is overriddable by default.\n+\n+sub::\n+\tInternal detail of implementation.  What is important is that\n+\tif this field is not present then per-repository override for\n+\tgiven feature is not supported.\n++\n+You wouldn't need to ever change it in gitweb config file.\n+\n+\n+Features in `%feature`\n+~~~~~~~~~~~~~~~~~~~~~~\n+The gitweb features that are configurable via `%feature` hash are listed\n+below.  This should be a complete list, but ultimately the authoritative\n+and complete list is in gitweb.cgi source code, with features described\n+in the comments.\n+\n+blame::\n+\tEnable the \"blame\" and \"blame_incremental\" blob views, showing for\n+\teach line the last commit that modified it; see linkgit:git-blame[1].\n+\tThis can be very CPU-intensive and is therefore disabled by default.\n++\n+This feature can be configured on a per-repository basis via\n+repository's `gitweb.blame` configuration variable (boolean).\n+\n+snapshot::\n+\tEnable and configure the \"snapshot\" action, which allows user to\n+\tdownload a compressed archive of any tree or commit, as produced\n+\tby linkgit:git-archive[1] and possibly additionally compressed.\n+\tThis can potentially generate high traffic if you have large project.\n++\n+The value of \\'default' is a list of names of snapshot formats,\n+defined in `%known_snapshot_formats` hash, that you wish to offer.\n+Supported formats include \"tgz\", \"tbz2\", \"txz\" (gzip/bzip2/xz\n+compressed tar archive) and \"zip\"; please consult gitweb sources for\n+a definitive list.  By default only \"tgz\" is offered.\n++\n+This feature can be configured on a per-repository basis via\n+repository's `gitweb.blame` configuration variable, which contains\n+a comma separated list of formats or \"none\" to disable snapshots.\n+Unknown values are ignored.\n+\n+grep::\n+\tEnable grep search, which lists the files in currently selected\n+\ttree (directory) containing the given string; see linkgit:git-grep[1].\n+\tThis can be potentially CPU-intensive, of course.  Enabled by default.\n++\n+This feature can be configured on a per-repository basis via\n+repository's `gitweb.grep` configuration variable (boolean).\n+\n+pickaxe::\n+\tEnable the so called pickaxe search, which will list the commits\n+\tthat introduced or removed a given string in a file.  This can be\n+\tpractical and quite faster alternative to \"blame\" action, but it is\n+\tstill potentially CPU-intensive.  Enabled by default.\n++\n+The pickaxe search is described in linkgit:git-log[1] (the\n+description of `-S<string>` option, which refers to pickaxe entry in\n+linkgit:gitdiffcore[7] for more details).\n++\n+This feature can be configured on a per-repository basis by setting\n+repository's `gitweb.pickaxe` configuration variable (boolean).\n+\n+show-sizes::\n+\tEnable showing size of blobs (ordinary files) in a \"tree\" view, in a\n+\tseparate column, similar to what `ls -l` does; see description of\n+\t`-l` option in linkgit:git-ls-tree[1] manpage.  This costs a bit of\n+\tI/O.  Enabled by default.\n++\n+This feature can be configured on a per-repository basis via\n+repository's `gitweb.showsizes` configuration variable (boolean).\n+\n+patches::\n+\tEnable and configure \"patches\" view, which displays list of commits in email\n+\t(plain text) output format; see also linkgit:git-format-patch[1].\n+\tThe value is the maximum number of patches in a patchset generated\n+\tin \"patches\" view.  Set the 'default' field to a list containing single\n+\titem of or to an empty list to disable patch view, or to a list\n+\tcontaining a single negative number to remove any limit.\n+\tDefault value is 16.\n++\n+This feature can be configured on a per-repository basis via\n+repository's `gitweb.patches` configuration variable (integer).\n+\n+avatar::\n+\tAvatar support.  When this feature is enabled, views such as\n+\t\"shortlog\" or \"commit\" will display an avatar associated with\n+\tthe email of each committer and author.\n++\n+Currently available providers are *\"gravatar\"* and *\"picon\"*.\n+Only one provider at a time can be selected ('default' is one element list).\n+If an unknown provider is specified, the feature is disabled.\n+*Note* that some providers might require extra Perl packages to be\n+installed; see 'gitweb/INSTALL' for more details.\n++\n+This feature can be configured on a per-repository basis via\n+repository's `gitweb.avatar` configuration variable.\n++\n+See also `%avatar_size` with pixel sizes for icons and avatars\n+(\"default\" is used for one-line like \"log\" and \"shortlog\", \"double\"\n+is used for two-line like \"commit\", \"commitdiff\" or \"tag\").  If the\n+default font sizes or lineheights are changed (e.g. via adding extra\n+CSS stylesheet in `@stylesheets`), it may be appropriate to change\n+these values.\n+\n+highlight::\n+\tServer-side syntax highlight support in \"blob\" view.  It requires\n+\t`$highlight_bin` program to be available (see the description of\n+\tthis variable in the \"Configuration variables\" section above),\n+\tand therefore is disabled by default.\n++\n+This feature can be configured on a per-repository basis via\n+repository's `gitweb.highlight` configuration variable (boolean).\n+\n+remote_heads::\n+\tEnable displaying remote heads (remote-tracking branches) in the \"heads\"\n+\tlist.  In most cases the list of remote-tracking branches is an\n+\tunnecessary internal private detail, and this feature is therefore\n+\tdisabled by default.  linkgit:git-instaweb[1], which is usually used\n+\tto browse local repositories, enables and uses this feature.\n++\n+This feature can be configured on a per-repository basis via\n+repository's `gitweb.remote_heads` configuration variable (boolean).\n+\n+\n+The remaining features cannot be overridden on a per project basis.\n+\n+search::\n+\tEnable text search, which will list the commits which match author,\n+\tcommitter or commit text to a given string; see the description of\n+\t`--author`, `--committer` and `--grep` options in linkgit:git-log[1]\n+\tmanpage.  Enabled by default.\n++\n+Project specific override is not supported.\n+\n+forks::\n+\tIf this feature is enabled, gitweb considers projects in\n+\tsubdirectories of project root (basename) to be forks of existing\n+\tprojects.  For each project `$projname.git`, projects in the\n+\t`$projname/` directory and its subdirectories will not be\n+\tshown in the main projects list.  Instead, a \\'+' mark is shown\n+\tnext to `$projname`, which links to a \"forks\" view that lists all\n+\tthe forks (all projects in `$projname/` subdirectory).  Additionally\n+\ta \"forks\" view for a project is linked from project summary page.\n++\n+If the project list is taken from a file (`$projects_list` points to a\n+file), forks are only recognized if they are listed after the main project\n+in that file.\n++\n+Project specific override is not supported.\n+\n+actions::\n+\tInsert custom links to the action bar of all project pages.  This\n+\tallows you to link to third-party scripts integrating into gitweb.\n++\n+The \"default\" value consists of a list of triplets in the form\n+`(\"<label>\", \"<link>\", \"<position>\")` where \"position\" is the label\n+after which to insert the link, \"link\" is a format string where `%n`\n+expands to the project name, `%f` to the project path within the\n+filesystem (i.e. \"$projectroot/$project\"), `%h` to the current hash\n+(\\'h' gitweb parameter) and `%b` to the current hash base\n+(\\'hb' gitweb parameter); `%%` expands to \\'%'.\n++\n+For example, at the time this page was written, the http://repo.or.cz[]\n+git hosting site set it to the following to enable graphical log\n+(using the third party tool *git-browser*):\n++\n+----------------------------------------------------------------------\n+$feature{'actions'}{'default'} =\n+\t[ ('graphiclog', '/git-browser/by-commit.html?r=%n', 'summary')];\n+----------------------------------------------------------------------\n++\n+This adds a link titled \"graphiclog\" after the \"summary\" link, leading to\n+`git-browser` script, passing `r=<project>` as a query parameter.\n++\n+Project specific override is not supported.\n+\n+timed::\n+\tEnable displaying how much time and how many git commands it took to\n+\tgenerate and display each page in the page footer (at the bottom of\n+\tpage).  For example the footer might contain: \"This page took 6.53325\n+\tseconds and 13 git commands to generate.\"  Disabled by default.\n++\n+Project specific override is not supported.\n+\n+javascript-timezone::\n+\tEnable and configure the ability to change a common timezone for dates\n+\tin gitweb output via JavaScript.  Dates in gitweb output include\n+\tauthordate and committerdate in \"commit\", \"commitdiff\" and \"log\"\n+\tviews, and taggerdate in \"tag\" view.  Enabled by default.\n++\n+The value is a list of three values: a default timezone (for if the client\n+hasn't selected some other timezone and saved it in a cookie), a name of cookie\n+where to store selected timezone, and a CSS class used to mark up\n+dates for manipulation.  If you want to turn this feature off, set \"default\"\n+to empty list: `[]`.\n++\n+Typical gitweb config files will only change starting (default) timezone,\n+and leave other elements at their default values:\n++\n+---------------------------------------------------------------------------\n+$feature{'javascript-timezone'}{'default'}[0] = \"utc\";\n+---------------------------------------------------------------------------\n++\n+The example configuration presented here is guaranteed to be backwards\n+and forward compatible.\n++\n+Timezone values can be \"local\" (for local timezone that browser uses), \"utc\"\n+(what gitweb uses when JavaScript or this feature is disabled), or numerical\n+timezones in the form of \"+/-HHMM\", such as \"+0200\".\n++\n+Project specific override is not supported.\n+\n+\n+EXAMPLES\n+--------\n+\n+To enable blame, pickaxe search, and snapshot support (allowing \"tar.gz\" and\n+\"zip\" snapshots), while allowing individual projects to turn them off, put\n+the following in your GITWEB_CONFIG file:\n+\n+        $feature{'blame'}{'default'} = [1];\n+        $feature{'blame'}{'override'} = 1;\n+\n+        $feature{'pickaxe'}{'default'} = [1];\n+        $feature{'pickaxe'}{'override'} = 1;\n+\n+        $feature{'snapshot'}{'default'} = ['zip', 'tgz'];\n+        $feature{'snapshot'}{'override'} = 1;\n+\n+If you allow overriding for the snapshot feature, you can specify which\n+snapshot formats are globally disabled. You can also add any command line\n+options you want (such as setting the compression level). For instance, you\n+can disable Zip compressed snapshots and set *gzip*(1) to run at level 6 by\n+adding the following lines to your gitweb configuration file:\n+\n+        $known_snapshot_formats{'zip'}{'disabled'} = 1;\n+        $known_snapshot_formats{'tgz'}{'compressor'} = ['gzip','-6'];\n+\n+ENVIRONMENT\n+-----------\n+The location of per-instance and system-wide configuration files can be\n+overridden using the following environment variables:\n+\n+GITWEB_CONFIG::\n+\tSets location of per-instance configuration file.\n+GITWEB_CONFIG_SYSTEM::\n+\tSets location of fallback system-wide configuration file.\n+\tThis file is read only if per-instance one does not exist.\n+GITWEB_CONFIG_COMMON::\n+\tSets location of common system-wide configuration file.\n+\n+\n+FILES\n+-----\n+gitweb_config.perl::\n+\tThis is default name of per-instance configuration file.  The\n+\tformat of this file is described above.\n+/etc/gitweb.conf::\n+\tThis is default name of fallback system-wide configuration\n+\tfile.  This file is used only if per-instance configuration\n+\tvariable is not found.\n+/etc/gitweb-common.conf::\n+\tThis is default name of common system-wide configuration\n+\tfile.\n+\n+\n+SEE ALSO\n+--------\n+linkgit:gitweb[1], linkgit:git-instaweb[1]\n+\n+'gitweb/README', 'gitweb/INSTALL'\n+\n+GIT\n+---\n+Part of the linkgit:git[1] suite\ndiff --git a/gitweb/README b/gitweb/README\nindex a998820..cf528d3 100644\n--- a/gitweb/README\n+++ b/gitweb/README\n@@ -41,140 +41,9 @@ Ultimate description on how to reconfigure the default features setting\n in your `GITWEB_CONFIG` or per-project in `project.git/config` can be found\n as comments inside 'gitweb.cgi'.\n \n-See also the \"Gitweb config file\" (with an example of config file), and\n-the \"Gitweb repositories\" sections in INSTALL file for gitweb.\n+See also gitweb.conf(5) manpage.\n \n \n-The gitweb config file is a fragment of perl code. You can set variables\n-using \"our $variable = value\"; text from \"#\" character until the end\n-of a line is ignored. See perlsyn(1) man page for details.\n-\n-Below is the list of variables which you might want to set in gitweb config.\n-See the top of 'gitweb.cgi' for the full list of variables and their\n-descriptions.\n-\n-Gitweb config file variables\n-~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n-\n-You can set, among others, the following variables in gitweb config files\n-(with the exception of $projectroot and $projects_list this list does\n-not include variables usually directly set during build):\n- * $GIT\n-   Core git executable to use.  By default set to \"$GIT_BINDIR/git\", which\n-   in turn is by default set to \"$(bindir)/git\".  If you use git from binary\n-   package, set this to \"/usr/bin/git\".  This can just be \"git\" if your\n-   webserver has a sensible PATH.  If you have multiple git versions\n-   installed it can be used to choose which one to use.\n- * $version\n-   Gitweb version, set automatically when creating gitweb.cgi from\n-   gitweb.perl. You might want to modify it if you are running modified\n-   gitweb.\n- * $projectroot\n-   Absolute filesystem path which will be prepended to project path;\n-   the path to repository is $projectroot/$project.  Set to\n-   $GITWEB_PROJECTROOT during installation.  This variable have to be\n-   set correctly for gitweb to find repositories.\n- * $projects_list\n-   Source of projects list, either directory to scan, or text file\n-   with list of repositories (in the \"<URI-encoded repository path> SP\n-   <URI-encoded repository owner>\" line format; actually there can be\n-   any sequence of whitespace in place of space (SP)).  Set to\n-   $GITWEB_LIST during installation.  If empty, $projectroot is used\n-   to scan for repositories.\n- * $my_url, $my_uri\n-   Full URL and absolute URL of gitweb script;\n-   in earlier versions of gitweb you might have need to set those\n-   variables, now there should be no need to do it.  See\n-   $per_request_config if you need to set them still.\n- * $base_url\n-   Base URL for relative URLs in pages generated by gitweb,\n-   (e.g. $logo, $favicon, @stylesheets if they are relative URLs),\n-   needed and used only for URLs with nonempty PATH_INFO via\n-   <base href=\"$base_url\">.  Usually gitweb sets its value correctly,\n-   and there is no need to set this variable, e.g. to $my_uri or \"/\".\n-   See $per_request_config if you need to set it anyway.\n- * $home_link\n-   Target of the home link on top of all pages (the first part of view\n-   \"breadcrumbs\").  By default set to absolute URI of a page ($my_uri).\n- * @stylesheets\n-   List of URIs of stylesheets (relative to base URI of a page). You\n-   might specify more than one stylesheet, for example use gitweb.css\n-   as base, with site specific modifications in separate stylesheet\n-   to make it easier to upgrade gitweb. You can add 'site' stylesheet\n-   for example by using\n-      push @stylesheets, \"gitweb-site.css\";\n-   in the gitweb config file.\n- * $logo_url, $logo_label\n-   URI and label (title) of GIT logo link (or your site logo, if you choose\n-   to use different logo image). By default they point to git homepage;\n-   in the past they pointed to git documentation at www.kernel.org.\n- * $projects_list_description_width\n-   The width (in characters) of the projects list \"Description\" column.\n-   Longer descriptions will be cut (trying to cut at word boundary);\n-   full description is available as 'title' attribute (usually shown on\n-   mouseover).  By default set to 25, which might be too small if you\n-   use long project descriptions.\n- * $projects_list_group_categories\n-   Enables the grouping of projects by category on the project list page.\n-   The category of a project is determined by the $GIT_DIR/category\n-   file or the 'gitweb.category' variable in its repository configuration.\n-   Disabled by default.\n- * $project_list_default_category\n-   Default category for projects for which none is specified.  If set\n-   to the empty string, such projects will remain uncategorized and\n-   listed at the top, above categorized projects.\n- * @git_base_url_list\n-   List of git base URLs used for URL to where fetch project from, shown\n-   in project summary page.  Full URL is \"$git_base_url/$project\".\n-   You can setup multiple base URLs (for example one for  git:// protocol\n-   access, and one for http:// \"dumb\" protocol access).  Note that per\n-   repository configuration in 'cloneurl' file, or as values of gitweb.url\n-   project config.\n- * $default_blob_plain_mimetype\n-   Default mimetype for blob_plain (raw) view, if mimetype checking\n-   doesn't result in some other type; by default 'text/plain'.\n- * $default_text_plain_charset\n-   Default charset for text files. If not set, web server configuration\n-   would be used.\n- * $mimetypes_file\n-   File to use for (filename extension based) guessing of MIME types before\n-   trying /etc/mime.types. Path, if relative, is taken currently as\n-   relative to the current git repository.\n- * $fallback_encoding\n-   Gitweb assumes this charset if line contains non-UTF-8 characters.\n-   Fallback decoding is used without error checking, so it can be even\n-   'utf-8'. Value must be valid encoding; see Encoding::Supported(3pm) man\n-   page for a list.   By default 'latin1', aka. 'iso-8859-1'.\n- * @diff_opts\n-   Rename detection options for git-diff and git-diff-tree. By default\n-   ('-M'); set it to ('-C') or ('-C', '-C') to also detect copies, or\n-   set it to () if you don't want to have renames detection.\n- * $prevent_xss\n-   If true, some gitweb features are disabled to prevent content in\n-   repositories from launching cross-site scripting (XSS) attacks.  Set this\n-   to true if you don't trust the content of your repositories. The default\n-   is false.\n- * $maxload\n-   Used to set the maximum load that we will still respond to gitweb queries.\n-   If server load exceed this value then return \"503 Service Unavailable\" error.\n-   Server load is taken to be 0 if gitweb cannot determine its value.  Set it to\n-   undefined value to turn it off.  The default is 300.\n- * $highlight_bin\n-   Path to the highlight executable to use (must be the one from\n-   http://www.andre-simon.de due to assumptions about parameters and output).\n-   Useful if highlight is not installed on your webserver's PATH.\n-   [Default: highlight]\n- * $per_request_config\n-   If set to code reference, it would be run once per each request.  You can\n-   set parts of configuration that change per session, e.g. by setting it to\n-     sub { $ENV{GL_USER} = $cgi->remote_user || \"gitweb\"; }\n-   Otherwise it is treated as boolean value: if true gitweb would process\n-   config file once per request, if false it would process config file only\n-   once.  Note: $my_url, $my_uri, and $base_url are overwritten with\n-   their default values before every request, so if you want to change\n-   them, be sure to set this variable to true or a code reference effecting\n-   the desired changes.  The default is true.\n-\n Projects list file format\n ~~~~~~~~~~~~~~~~~~~~~~~~~\n \n-- \n1.7.6\n"},{"id":"177244","messageId":"1318098723-12813-4-git-send-email-jnareb@gmail.com","threadId":"28634","inReplyTo":"1318098723-12813-1-git-send-email-jnareb@gmail.com","subject":"[PATCHv5/RFC 3/6] gitweb: Add manpage for gitweb","fromName":"Jakub Narebski","fromEmail":"jnareb@gmail.com","sentAt":"2011-10-08T18:32:00Z","receivedAt":"2011-10-08T18:32:00Z","isPatch":false,"sender":{"key":"jnareb@gmail.com","avatar":"https://avatars.githubusercontent.com/u/2706?v=4"},"body":"Most of what is in gitweb.txt it has been pulled directly from the\nREADME and INSTALL files of gitweb.\n\nCurrent version is somewhat based on structure of SVN::Web manpage\n(one of web interfaces for Subversion).\n\ngitweb.conf(5) i.e. gitweb configuration manpage now refers to\nappropriate sections in gitweb(1).  gitweb/README now refers to\ngitweb/INSTALL and gitweb(1) manpage.  gitweb/INSTALL now refers to\ngitweb.conf(5) and gitweb(1).\n\nInspired-by: Drew Northup <drew.northup@maine.edu>\nSigned-off-by: Jakub Narebski <jnareb@gmail.com>\n---\nDoes anyone know a well structured _manpage_ for a web application\n(other than SVN::Web) to borrow ideas from for this one?\n\nJonathan, could you please review also this patch, if you have some\nfree time?  Thanks in advance.\n\n Documentation/Makefile        |    2 +-\n Documentation/gitweb.conf.txt |    9 +\n Documentation/gitweb.txt      |  703 +++++++++++++++++++++++++++++++++++++++++\n gitweb/INSTALL                |   94 +-----\n gitweb/README                 |  278 ++---------------\n 5 files changed, 741 insertions(+), 345 deletions(-)\n create mode 100644 Documentation/gitweb.txt\n\ndiff --git a/Documentation/Makefile b/Documentation/Makefile\nindex 6d71943..aebab11 100644\n--- a/Documentation/Makefile\n+++ b/Documentation/Makefile\n@@ -1,7 +1,7 @@\n MAN1_TXT= \\\n \t$(filter-out $(addsuffix .txt, $(ARTICLES) $(SP_ARTICLES)), \\\n \t\t$(wildcard git-*.txt)) \\\n-\tgitk.txt git.txt\n+\tgitk.txt gitweb.txt git.txt\n MAN5_TXT=gitattributes.txt gitignore.txt gitmodules.txt githooks.txt \\\n \tgitrepository-layout.txt gitweb.conf.txt\n MAN7_TXT=gitcli.txt gittutorial.txt gittutorial-2.txt \\\ndiff --git a/Documentation/gitweb.conf.txt b/Documentation/gitweb.conf.txt\nindex 31eb527..eaff477 100644\n--- a/Documentation/gitweb.conf.txt\n+++ b/Documentation/gitweb.conf.txt\n@@ -35,6 +35,10 @@ CGI script with the default name 'gitweb_config.perl' -- allowing\n one to have multiple gitweb instances with different configurations by\n the use of symlinks.\n \n+Note that some configuration can be controlled on per-repository rather than\n+gitweb-wide basis: see \"Per-repository gitweb configuration\" subsection on\n+linkgit:gitweb[1] manpage.\n+\n \n DISCUSSION\n ----------\n@@ -109,6 +113,8 @@ Location of repositories\n The configuration variables described below control how gitweb finds\n git repositories, and how repositories are displayed and accessed.\n \n+See also \"Repositories\" and later subsections in linkgit:gitweb[1] manpage.\n+\n $projectroot::\n \tAbsolute filesystem path which will be prepended to project path;\n \tthe path to repository is `$projectroot/$project`.  Set to\n@@ -193,6 +199,9 @@ our $export_ok = \"git-daemon-export-ok\";\n ----------------------------------------------------------------------------\n +\n If not set (default), it means that this feature is disabled.\n++\n+See also more involved example in \"Controlling access to git repositories\"\n+subsection on linkgit:gitweb[1] manpage.\n \n $strict_export::\n \tOnly allow viewing of repositories also shown on the overview page.\ndiff --git a/Documentation/gitweb.txt b/Documentation/gitweb.txt\nnew file mode 100644\nindex 0000000..2acdb3b\n--- /dev/null\n+++ b/Documentation/gitweb.txt\n@@ -0,0 +1,703 @@\n+gitweb(1)\n+=========\n+\n+NAME\n+----\n+gitweb - Git web interface (web frontend to Git repositories)\n+\n+SYNOPSIS\n+--------\n+To get started with gitweb, run linkgit:git-instaweb[1] from a git repository.\n+This would configure and start your web server, and run web browser pointing to\n+gitweb page.\n+\n+See http://git.kernel.org/?p=git/git.git;a=tree;f=gitweb[] or\n+http://repo.or.cz/w/git.git/tree/HEAD:/gitweb/[] for gitweb source code,\n+browsed using gitweb itself.\n+\n+\n+DESCRIPTION\n+-----------\n+Gitweb provides a web interface to git repositories.  It's features include:\n+\n+* Viewing multiple Git repositories with common root.\n+* Browsing every revision of the repository.\n+* Viewing the contents of files in the repository at any revision.\n+* Viewing the revision log of branches, history of files and directories,\n+  see what was changed when, by who.\n+* Viewing the blame/annotation details of any file (if enabled).\n+* Generating RSS and Atom feeds of commits, for any branch.\n+  The feeds are auto-discoverable in modern web browsers.\n+* Viewing everything that was changed in a revision, and step through\n+  revisions one at a time, viewing the history of the repository.\n+* Finding commits which commit messages matches given search term.\n+\n+CONFIGURATION\n+-------------\n+Various aspects of gitweb's behavior can be controlled through the configuration\n+file 'gitweb_config.perl' or '/etc/gitweb.conf'.  See the linkgit:gitweb.conf[5]\n+for details.\n+\n+Repositories\n+~~~~~~~~~~~~\n+Gitweb can show information from one or more Git repositories.  These\n+repositories have to be all on local filesystem, and have to share common\n+repository root, i.e. be all under a single parent repository (but see also\n+\"Advanced web server setup\" section, \"Webserver configuration with multiple\n+projects' root\" subsection).\n+\n+-----------------------------------------------------------------------\n+our $projectroot = '/path/to/parent/directory';\n+-----------------------------------------------------------------------\n+\n+The default value for `$projectroot` is '/pub/git'.  You can change it during\n+building gitweb via `GITWEB_PROJECTROOT` build configuration variable.\n+\n+By default all git repositories under `$projectroot` are visible and available\n+to gitweb.  The list of projects is generated by default by scanning the\n+`$projectroot` directory for git repositories (for object databases to be\n+more exact; gitweb is not interested in a working area, and is best suited\n+to showing \"bare\" repositories).\n+\n+The name of repository in gitweb is path to it's `$GIT_DIR` (it's object\n+database) relative to `$projectroot`.  Therefore the repository $repo can be\n+found at \"$projectroot/$repo\".\n+\n+\n+Projects list file format\n+~~~~~~~~~~~~~~~~~~~~~~~~~\n+Instead of having gitweb find repositories by scanning filesystem\n+starting from $projectroot, you can provide a pre-generated list of\n+visible projects by setting `$projects_list` to point to a plain text\n+file with a list of projects (with some additional info).\n+\n+This file uses the following format:\n+\n+* One record (for project / repository) per line; does not support line\n+continuation (newline escaping).\n+\n+* Leading and trailing whitespace are ignored.\n+\n+* Whitespace separated fields; any run of whitespace can be used as field\n+separator (rules for Perl's \"`split(\" \", $line)`\").\n+\n+* Fields use modified URI encoding, defined in RFC 3986, section 2.1\n+(Percent-Encoding), or rather \"Query string encoding\" (see\n+link:http://en.wikipedia.org/wiki/Query_string#URL_encoding[]), the difference\n+being that SP (\" \") can be encoded as \"{plus}\" (and therefore \"{plus}\" has to be\n+also percent-encoded).\n++\n+Reserved characters are: \"%\" (used for encoding), \"{plus}\" (can be used to\n+encode SPACE), all whitespace characters as defined in Perl, including SP,\n+TAB and LF, (used to separate fields in a record).\n+\n+* Currently recognized fields are:\n+<repository path>::\n+\tpath to repository GIT_DIR, relative to `$projectroot`\n+<repository owner>::\n+\tdisplayed as repository owner, preferably full name, or email,\n+\tor both\n+\n+You can generate the projects list index file using the project_index action\n+(the 'TXT' link on projects list page) directly from gitweb; see also\n+\"Generating projects list using gitweb\" section below.\n+\n+Example contents:\n+-----------------------------------------------------------------------\n+foo.git       Joe+R+Hacker+<joe@example.com>\n+foo/bar.git   O+W+Ner+<owner@example.org>\n+-----------------------------------------------------------------------\n+\n+\n+By default this file controls only which projects are *visible* on projects\n+list page (note that entries that do not point to correctly recognized git\n+repositories won't be displayed by gitweb).  Even if a project is not\n+visible on projects list page, you can view it nevertheless by hand-crafting\n+a gitweb URL.  By setting `$strict_export` configuration variable (see\n+linkgit:gitweb.conf[5]) to true value you can allow viewing only of\n+repositories also shown on the overview page (i.e. only projects explicitly\n+listed in projects list file will be accessible).\n+\n+\n+Generating projects list using gitweb\n+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n+\n+We assume that GITWEB_CONFIG has its default Makefile value, namely\n+'gitweb_config.perl'. Put the following in 'gitweb_make_index.perl' file:\n+----------------------------------------------------------------------------\n+read_config_file(\"gitweb_config.perl\");\n+$projects_list = $projectroot;\n+----------------------------------------------------------------------------\n+\n+Then create the following script to get list of project in the format\n+suitable for GITWEB_LIST build configuration variable (or\n+`$projects_list` variable in gitweb config):\n+\n+----------------------------------------------------------------------------\n+#!/bin/sh\n+\n+export GITWEB_CONFIG=\"gitweb_make_index.perl\"\n+export GATEWAY_INTERFACE=\"CGI/1.1\"\n+export HTTP_ACCEPT=\"*/*\"\n+export REQUEST_METHOD=\"GET\"\n+export QUERY_STRING=\"a=project_index\"\n+\n+perl -- /var/www/cgi-bin/gitweb.cgi\n+----------------------------------------------------------------------------\n+\n+Run this script and save its output to a file.  This file could then be used\n+as projects list file, which means that you can set `$projects_list` to its\n+filename.\n+\n+\n+Controlling access to git repositories\n+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n+By default all git repositories under `$projectroot` are visible and\n+available to gitweb.  You can however configure how gitweb controls access\n+to repositories.\n+\n+* As described in \"Projects list file format\" section, you can control which\n+projects are *visible* by selectively including repositories in projects\n+list file, and setting `$projects_list` gitweb configuration variable to\n+point to it.  With `$strict_export` set, projects list file can be used to\n+control which repositories are *available* as well.\n+\n+* You can configure gitweb to only list and allow viewing of the explicitly\n+exported repositories, via `$export_ok` variable in gitweb config file; see\n+linkgit:gitweb.conf[5] manpage.  If it evaluates to true, gitweb shows\n+repositories only if this file named by `$export_ok` exists in its object\n+database (if directory has the magic file named `$export_ok`).\n++\n+For example linkgit:git-daemon[1] by default (unless `--export-all` option\n+is used) allows pulling only for those repositories that have\n+'git-daemon-export-ok' file.  Adding\n++\n+--------------------------------------------------------------------------\n+our $export_ok = \"git-daemon-export-ok\";\n+--------------------------------------------------------------------------\n++\n+makes gitweb show and allow access only to those repositories that can be\n+fetched from via `git://` protocol.\n+\n+* Finally, it is possible to specify an arbitrary perl subroutine that will\n+be called for each repository to determine if it can be exported.  The\n+subroutine receives an absolute path to the project (repository) as its only\n+parameter (i.e. \"$projectroot/$project\").\n++\n+For example, if you use mod_perl to run the script, and have dumb\n+HTTP protocol authentication configured for your repositories, you\n+can use the following hook to allow access only if the user is\n+authorized to read the files:\n++\n+--------------------------------------------------------------------------\n+$export_auth_hook = sub {\n+\tuse Apache2::SubRequest ();\n+\tuse Apache2::Const -compile => qw(HTTP_OK);\n+\tmy $path = \"$_[0]/HEAD\";\n+\tmy $r    = Apache2::RequestUtil->request;\n+\tmy $sub  = $r->lookup_file($path);\n+\treturn $sub->filename eq $path\n+\t    && $sub->status == Apache2::Const::HTTP_OK;\n+};\n+--------------------------------------------------------------------------\n+\n+\n+Per-repository gitweb configuration\n+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n+You can configure individual repositories shown in gitweb by creating file\n+in the 'GIT_DIR' of git repository, or by setting some repo configuration\n+variable (in 'GIT_DIR/config', see linkgit:git-config[1]).\n+\n+You can use the following files in repository:\n+\n+README.html::\n+\tA html file (HTML fragment) which is included on the gitweb project\n+\t\"summary\" page inside `<div>` block element. You can use it for longer\n+\tdescription of a project, to provide links (for example to project's\n+\thomepage), etc. This is recognized only if XSS prevention is off\n+\t(`$prevent_xss` is false, see linkgit:gitweb.conf[5]); a way to include\n+\ta README safely when XSS prevention is on may be worked out in the\n+\tfuture.\n+\n+description (or `gitweb.description`)::\n+\tShort (shortened to `$projects_list_description_width` in the projects\n+\tlist page, which is 25 characters by default; see\n+\tlinkgit:gitweb.conf[5]) single line description of a project (of a\n+\trepository).  Plain text file; HTML will be escaped.  By default set to\n++\n+-------------------------------------------------------------------------------\n+Unnamed repository; edit this file to name it for gitweb.\n+-------------------------------------------------------------------------------\n++\n+from the template during repository creation, usually installed in\n+'/usr/share/git-core/templates/'.  You can use the `gitweb.description` repo\n+configuration variable, but the file takes precedence.\n+\n+category (or `gitweb.category`)::\n+\tSinge line category of a project, used to group projects if\n+\t`$projects_list_group_categories` is enabled.  By default (file and\n+\tconfiguration variable absent), uncategorized projects are put in the\n+\t`$project_list_default_category` category.  You can use the\n+\t`gitweb.category` repo configuration variable, but the file takes\n+\tprecedence.\n++\n+The configuration variables `$projects_list_group_categories` and\n+`$project_list_default_category` are described in linkgit:gitweb.conf[5]\n+\n+cloneurl (or multiple-valued `gitweb.url`)::\n+\tFile with repository URL (used for clone and fetch), one per line.\n+\tDisplayed in the project summary page. You can use multiple-valued\n+\t`gitweb.url` repository configuration variable for that, but the file\n+\ttakes precedence.\n++\n+This is per-repository enhancement / version of global prefix-based\n+`@git_base_url_list` gitweb configuration variable (see\n+linkgit:gitweb.conf[5]).\n+\n+gitweb.owner::\n+\tYou can use the `gitweb.owner` repository configuration variable to set\n+\trepository's owner.  It is displayed in the project list and summary\n+\tpage.\n++\n+If it's not set, filesystem directory's owner is used (via GECOS field,\n+i.e. real name field from *getpwuid*(3)) if `$projects_list` is unset\n+(gitweb scans `$projectroot` for repositories); if `$projects_list`\n+points to file with list of repositories, then project owner defaults to\n+value from this file for given repository.\n+\n+various `gitweb.*` config variables (in config)::\n+\tRead description of `%feature` hash for detailed list, and descriptions.\n+\tSee also \"Configuring gitweb features\" section in linkgit:gitweb.conf[5]\n+\n+\n+ACTIONS, AND URLS\n+-----------------\n+Gitweb can use path_info (component) based URLs, or it can pass all necessary\n+information via query parameters.  The typical gitweb URLs are broken down in to\n+five components:\n+\n+-----------------------------------------------------------------------\n+.../gitweb.cgi/<repo>/<action>/<revision>:/<path>?<arguments>\n+-----------------------------------------------------------------------\n+\n+repo::\n+\tThe repository the action will be performed on.\n++\n+All actions except for those that list all available projects,\n+in whatever form, require this parameter.\n+\n+action::\n+\tThe action that will be run.  Defaults to 'projects_list' if repo\n+\tis not set, and to 'summary' otherwise.\n+\n+revision::\n+\tRevision shown.  Defaults to HEAD.\n+\n+path::\n+\tThe path within the <repository> that the action is performed on,\n+\tfor those actions that require it.\n+\n+arguments::\n+\tAny arguments that control the behaviour of the action.\n+\n+Some actions require or allow to specify two revisions, and sometimes even two\n+pathnames.  In most general form such path_info (component) based gitweb URL\n+looks like this:\n+\n+-----------------------------------------------------------------------\n+.../gitweb.cgi/<repo>/<action>/<revision_from>:/<path_from>..<revision_to>:/<path_to>?<arguments>\n+-----------------------------------------------------------------------\n+\n+\n+Each action is implemented as a subroutine, and must be present in %actions\n+hash.  Some actions are disabled by default, and must be turned on via feature\n+mechanism.  For example to enable 'blame' view add the following to gitweb\n+configuration file:\n+\n+-----------------------------------------------------------------------\n+$feature{'blame'}{'default'} = [1];\n+-----------------------------------------------------------------------\n+\n+\n+Actions:\n+~~~~~~~~\n+The standard actions are:\n+\n+project_list::\n+\tLists the available Git repositories.  This is the default command if no\n+\trepository is specified in the URL.\n+\n+summary::\n+\tDisplays summary about given repository.  This is the default command if\n+\tno action is specified in URL, and only repository is specified.\n+\n+heads::\n+remotes::\n+\tLists all local or all remote-tracking branches in given repository.\n++\n+The latter is not available by default, unless configured.\n+\n+tags::\n+\tList all tags (lightweight and annotated) in given repository.\n+\n+blob::\n+tree::\n+\tShows the files and directories in a given repository path, at given\n+\trevision.  This is default command if no action is specified in the URL,\n+\tand path is given.\n+\n+blob_plain::\n+\tReturns the raw data for the file in given repository, at given path and\n+\trevision.  Links to this action are marked 'raw'.\n+\n+blobdiff::\n+\tShows the difference between two revisions of the same file.\n+\n+blame::\n+blame_incremental::\n+\tShows the blame (also called annotation) information for a file. On a\n+\tper line basis it shows the revision in which that line was last changed\n+\tand the user that committed the change.  The incremental version (which\n+\tif configured is used automatically when JavaScript is enabled) uses\n+\tAjax to incrementally add blame info to the contents of given file.\n++\n+This action is disabled by default for performance reasons.\n+\n+commit::\n+commitdiff::\n+\tShows information about a specific commit in a repository.  The 'commit'\n+\tview shows information about commit in more detail, the 'commitdiff'\n+\taction shows changeset for given commit.\n+\n+patch:: \n+\tReturns the commit in plain text mail format, suitable for applying with\n+\tlinkgit:git-am[1].\n+\n+tag::\n+\tDisplay specific annotated tag (tag object).\t\n+\n+log::\n+shortlog::\n+\tShows log information (commit message or just commit subject) for a\n+\tgiven branch (starting from given revision).\n++\n+The 'shortlog' view is more compact; it shows one commit per line.\n+\n+history::\n+\tShows history of the file or directory in a given repository path,\n+\tstarting from given revision (defaults to HEAD, i.e. default branch).\n++\n+This view is similar to 'shortlog' view.\n+\n+rss::\n+atom::\n+\tGenerates an RSS (or Atom) feed of changes to repository.\n+\n+\n+WEBSERVER CONFIGURATION\n+-----------------------\n+This section explains how to configure some common webservers to run gitweb. In\n+all cases, `/path/to/gitweb` in the examples is the directory you ran installed\n+gitweb in, and contains `gitweb_config.perl`.\n+\n+If you've configured a web server that isn't listed here for gitweb, please send\n+in the instructions so they can be included in a future release.\n+\n+Apache as CGI\n+~~~~~~~~~~~~~\n+Apache must be configured to support CGI scripts in the directory in\n+which gitweb is installed.  Let's assume that it is '/var/www/cgi-bin'\n+directory.\n+\n+-----------------------------------------------------------------------\n+ScriptAlias /cgi-bin/ \"/var/www/cgi-bin/\"\n+\n+<Directory \"/var/www/cgi-bin\">\n+    Options Indexes FollowSymlinks ExecCGI\n+    AllowOverride None\n+    Order allow,deny\n+    Allow from all\n+</Directory>\n+-----------------------------------------------------------------------\n+\n+With that configuration the full path to browse repositories would be:\n+\n+  http://server/cgi-bin/gitweb.cgi\n+\n+Apache with mod_perl, via ModPerl::Registry\n+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n+You can use mod_perl with gitweb.  You must install Apache::Registry\n+(for mod_perl 1.x) or ModPerl::Registry (for mod_perl 2.x) to enable\n+this support.\n+\n+Assuming that gitweb is installed to '/var/www/perl', the following\n+Apache configuration (for mod_perl 2.x) is suitable.\n+\n+-----------------------------------------------------------------------\n+Alias /perl \"/var/www/perl\"\n+\n+<Directory \"/var/www/perl\">\n+    SetHandler perl-script\n+    PerlResponseHandler ModPerl::Registry\n+    PerlOptions +ParseHeaders\n+    Options Indexes FollowSymlinks +ExecCGI\n+    AllowOverride None\n+    Order allow,deny\n+    Allow from all\n+</Directory>\n+-----------------------------------------------------------------------\n+\n+With that configuration the full path to browse repositories would be:\n+\n+  http://server/perl/gitweb.cgi\n+\n+Apache with FastCGI\n+~~~~~~~~~~~~~~~~~~~\n+Gitweb works with Apache and FastCGI.  First you need to rename, copy\n+or symlink gitweb.cgi to gitweb.fcgi.  Let's assume that gitweb is\n+installed in '/usr/share/gitweb' directory.  The following Apache\n+configuration is suitable (UNTESTED!)\n+\n+-----------------------------------------------------------------------\n+FastCgiServer /usr/share/gitweb/gitweb.cgi\n+ScriptAlias /gitweb /usr/share/gitweb/gitweb.cgi\n+\n+Alias /gitweb/static /usr/share/gitweb/static\n+<Directory /usr/share/gitweb/static>\n+    SetHandler default-handler\n+</Directory>\n+-----------------------------------------------------------------------\n+\n+With that configuration the full path to browse repositories would be:\n+\n+  http://server/gitweb\n+\n+\n+ADVANCED WEB SERVER SETUP\n+-------------------------\n+All of those examples use request rewriting, and need `mod_rewrite`\n+(or equivalent; examples below are written for Apache).\n+\n+Single URL for gitweb and for fetching\n+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n+If you want to have one URL for both gitweb and your `http://`\n+repositories, you can configure Apache like this:\n+\n+-----------------------------------------------------------------------\n+<VirtualHost *:80>\n+    ServerName    git.example.org\n+    DocumentRoot  /pub/git\n+    SetEnv        GITWEB_CONFIG   /etc/gitweb.conf\n+\n+    # turning on mod rewrite\n+    RewriteEngine on\n+\n+    # make the front page an internal rewrite to the gitweb script\n+    RewriteRule ^/$  /cgi-bin/gitweb.cgi\n+\n+    # make access for \"dumb clients\" work\n+    RewriteRule ^/(.*\\.git/(?!/?(HEAD|info|objects|refs)).*)?$ \\\n+                /cgi-bin/gitweb.cgi%{REQUEST_URI}  [L,PT]\n+</VirtualHost>\n+-----------------------------------------------------------------------\n+\n+The above configuration expects your public repositories to live under\n+'/pub/git' and will serve them as `http://git.domain.org/dir-under-pub-git`,\n+both as cloneable GIT URL and as browseable gitweb interface.  If you then\n+start your linkgit:git-daemon[1] with `--base-path=/pub/git --export-all`\n+then you can even use the `git://` URL with exactly the same path.\n+\n+Setting the environment variable `GITWEB_CONFIG` will tell gitweb to use the\n+named file (i.e. in this example '/etc/gitweb.conf') as a configuration for\n+gitweb.  You don't really need it in above example; it is required only if\n+your configuration file is in different place than built-in (during\n+compiling gitweb) 'gitweb_config.perl' or '/etc/gitweb.conf'.  See\n+linkgit:gitweb.conf[5] for details, especially information about precedence\n+rules.\n+\n+If you use the rewrite rules from the example you *might* also need\n+something like the following in your gitweb configuration file\n+('/etc/gitweb.conf' following example):\n+----------------------------------------------------------------------------\n+@stylesheets = (\"/some/absolute/path/gitweb.css\");\n+$my_uri    = \"/\";\n+$home_link = \"/\";\n+$per_request_config = 1;\n+----------------------------------------------------------------------------\n+Nowadays though gitweb should create HTML base tag when needed (to set base\n+URI for relative links), so it should work automatically.\n+\n+\n+Webserver configuration with multiple projects' root\n+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n+If you want to use gitweb with several project roots you can edit your\n+Apache virtual host and gitweb configuration files in the following way.\n+\n+The virtual host configuration (in Apache configuration file) should look\n+like this:\n+--------------------------------------------------------------------------\n+<VirtualHost *:80>\n+    ServerName    git.example.org\n+    DocumentRoot  /pub/git\n+    SetEnv        GITWEB_CONFIG  /etc/gitweb.conf\n+\n+    # turning on mod rewrite\n+    RewriteEngine on\n+\n+    # make the front page an internal rewrite to the gitweb script\n+    RewriteRule ^/$  /cgi-bin/gitweb.cgi  [QSA,L,PT]\n+\n+    # look for a public_git folder in unix users' home\n+    # http://git.example.org/~<user>/\n+    RewriteRule ^/\\~([^\\/]+)(/|/gitweb.cgi)?$\t/cgi-bin/gitweb.cgi \\\n+                [QSA,E=GITWEB_PROJECTROOT:/home/$1/public_git/,L,PT]\n+\n+    # http://git.example.org/+<user>/\n+    #RewriteRule ^/\\+([^\\/]+)(/|/gitweb.cgi)?$\t/cgi-bin/gitweb.cgi \\\n+                 [QSA,E=GITWEB_PROJECTROOT:/home/$1/public_git/,L,PT]\n+\n+    # http://git.example.org/user/<user>/\n+    #RewriteRule ^/user/([^\\/]+)/(gitweb.cgi)?$\t/cgi-bin/gitweb.cgi \\\n+                 [QSA,E=GITWEB_PROJECTROOT:/home/$1/public_git/,L,PT]\n+\n+    # defined list of project roots\n+    RewriteRule ^/scm(/|/gitweb.cgi)?$ /cgi-bin/gitweb.cgi \\\n+                [QSA,E=GITWEB_PROJECTROOT:/pub/scm/,L,PT]\n+    RewriteRule ^/var(/|/gitweb.cgi)?$ /cgi-bin/gitweb.cgi \\\n+                [QSA,E=GITWEB_PROJECTROOT:/var/git/,L,PT]\n+\n+    # make access for \"dumb clients\" work\n+    RewriteRule ^/(.*\\.git/(?!/?(HEAD|info|objects|refs)).*)?$ \\\n+                /cgi-bin/gitweb.cgi%{REQUEST_URI}  [L,PT]\n+</VirtualHost>\n+--------------------------------------------------------------------------\n+\n+Here actual project root is passed to gitweb via `GITWEB_PROJECT_ROOT`\n+environment variable from a web server, so you need to put the following\n+line in gitweb configuration file ('/etc/gitweb.conf' in above example):\n+--------------------------------------------------------------------------\n+$projectroot = $ENV{'GITWEB_PROJECTROOT'} || \"/pub/git\";\n+--------------------------------------------------------------------------\n+*Note* that this requires to be set for each request, so either\n+`$per_request_config` must be false, or the above must be put in code\n+referenced by `$per_request_config`;\n+\n+These configurations enable two things. First, each unix user (`<user>`) of\n+the server will be able to browse through gitweb git repositories found in\n+'~/public_git/' with the following url:\n+\n+  http://git.example.org/~<user>/\n+\n+If you do not want this feature on your server just remove the second\n+rewrite rule.\n+\n+If you already use `mod_userdir` in your virtual host or you don't want to\n+use the \\'~' as first character, just comment or remove the second rewrite\n+rule, and uncomment one of the following according to what you want.\n+\n+Second, repositories found in '/pub/scm/' and '/var/git/' will be accessible\n+through `http://git.example.org/scm/` and `http://git.example.org/var/`.\n+You can add as many project roots as you want by adding rewrite rules like\n+the third and the fourth.\n+\n+\n+PATH_INFO usage\n+~~~~~~~~~~~~~~~\n+If you enable PATH_INFO usage in gitweb by putting\n+----------------------------------------------------------------------------\n+$feature{'pathinfo'}{'default'} = [1];\n+----------------------------------------------------------------------------\n+in your gitweb configuration file, it is possible to set up your server so\n+that it consumes and produces URLs in the form\n+\n+  http://git.example.com/project.git/shortlog/sometag\n+\n+i.e. without 'gitweb.cgi' part, by using a configuration such as the\n+following.  This configuration assumes that '/var/www/gitweb' is the\n+DocumentRoot of your webserver, contains the gitweb.cgi script and\n+complementary static files (stylesheet, favicon, JavaScript):\n+\n+----------------------------------------------------------------------------\n+<VirtualHost *:80>\n+\tServerAlias git.example.com\n+\n+\tDocumentRoot /var/www/gitweb\n+\n+\t<Directory /var/www/gitweb>\n+\t\tOptions ExecCGI\n+\t\tAddHandler cgi-script cgi\n+\n+\t\tDirectoryIndex gitweb.cgi\n+\n+\t\tRewriteEngine On\n+\t\tRewriteCond %{REQUEST_FILENAME} !-f\n+\t\tRewriteCond %{REQUEST_FILENAME} !-d\n+\t\tRewriteRule ^.* /gitweb.cgi/$0 [L,PT]\n+\t</Directory>\n+</VirtualHost>\n+----------------------------------------------------------------------------\n+The rewrite rule guarantees that existing static files will be properly\n+served, whereas any other URL will be passed to gitweb as PATH_INFO\n+parameter.\n+\n+*Notice* that in this case you don't need special settings for\n+`@stylesheets`, `$my_uri` and `$home_link`, but you lose \"dumb client\"\n+access to your project .git dirs (described in \"Single URL for gitweb and\n+for fetching\" section).  A possible workaround for the latter is the\n+following: in your project root dir (e.g. '/pub/git') have the projects\n+named *without* a .git extension (e.g. '/pub/git/project' instead of\n+'/pub/git/project.git') and configure Apache as follows:\n+----------------------------------------------------------------------------\n+<VirtualHost *:80>\n+\tServerAlias git.example.com\n+\n+\tDocumentRoot /var/www/gitweb\n+\n+\tAliasMatch ^(/.*?)(\\.git)(/.*)?$ /pub/git$1$3\n+\t<Directory /var/www/gitweb>\n+\t\tOptions ExecCGI\n+\t\tAddHandler cgi-script cgi\n+\n+\t\tDirectoryIndex gitweb.cgi\n+\n+\t\tRewriteEngine On\n+\t\tRewriteCond %{REQUEST_FILENAME} !-f\n+\t\tRewriteCond %{REQUEST_FILENAME} !-d\n+\t\tRewriteRule ^.* /gitweb.cgi/$0 [L,PT]\n+\t</Directory>\n+</VirtualHost>\n+----------------------------------------------------------------------------\n+\n+The additional AliasMatch makes it so that\n+\n+  http://git.example.com/project.git\n+\n+will give raw access to the project's git dir (so that the project can be\n+cloned), while\n+\n+  http://git.example.com/project\n+\n+will provide human-friendly gitweb access.\n+\n+This solution is not 100% bulletproof, in the sense that if some project has\n+a named ref (branch, tag) starting with 'git/', then paths such as\n+\n+  http://git.example.com/project/command/abranch..git/abranch\n+\n+will fail with a 404 error.\n+\n+\n+BUGS\n+----\n+Please report any bugs or feature requests to git@vger.kernel.org,\n+putting \"gitweb\" in the subject of email.\n+\n+SEE ALSO\n+--------\n+linkgit:gitweb.conf[5], linkgit:git-instaweb[1]\n+\n+'gitweb/README', 'gitweb/INSTALL'\n+\n+GIT\n+---\n+Part of the linkgit:git[1] suite\ndiff --git a/gitweb/INSTALL b/gitweb/INSTALL\nindex f5efe74..d134ffe 100644\n--- a/gitweb/INSTALL\n+++ b/gitweb/INSTALL\n@@ -229,7 +229,7 @@ Gitweb config file\n ------------------\n \n See also \"Runtime gitweb configuration\" section in README file\n-for gitweb (in gitweb/README).\n+for gitweb (in gitweb/README), and gitweb.conf(5) manpage.\n \n - You can configure gitweb further using the per-instance gitweb configuration file;\n   by default this is a file named gitweb_config.perl in the same place as\n@@ -287,97 +287,19 @@ adding the following lines to your $GITWEB_CONFIG:\n Gitweb repositories\n -------------------\n \n-- By default all git repositories under projectroot are visible and\n-  available to gitweb. The list of projects is generated by default by\n-  scanning the projectroot directory for git repositories (for object\n-  databases to be more exact).\n+By default gitweb shows all git repositories under single common repository\n+root on a local filesystem; see description of GITWEB_PROJECTROOT build-time\n+configuration variable above (and also of GITWEB_LIST).\n \n-  You can provide a pre-generated list of [visible] repositories,\n-  together with information about their owners (the project ownership\n-  defaults to the owner of the repository directory otherwise), by setting\n-  the GITWEB_LIST build configuration variable (or the $projects_list\n-  variable in the gitweb config file) to point to a plain file.\n-\n-  Each line of the projects list file should consist of the url-encoded path\n-  to the project repository database (relative to projectroot), followed\n-  by the url-encoded project owner on the same line (separated by a space).\n-  Spaces in both project path and project owner have to be encoded as either\n-  '%20' or '+'.\n-\n-  Other characters that have to be url-encoded, i.e. replaced by '%'\n-  followed by two-digit character number in octal, are: other whitespace\n-  characters (because they are field separator in a record), plus sign '+'\n-  (because it can be used as replacement for spaces), and percent sign '%'\n-  (which is used for encoding / escaping).\n-\n-  You can generate the projects list index file using the project_index\n-  action (the 'TXT' link on projects list page) directly from gitweb.\n-\n-- By default, even if a project is not visible on projects list page, you\n-  can view it nevertheless by hand-crafting a gitweb URL. You can set the\n-  GITWEB_STRICT_EXPORT build configuration variable (or the $strict_export\n-  variable in the gitweb config file) to only allow viewing of\n-  repositories also shown on the overview page.\n-\n-- Alternatively, you can configure gitweb to only list and allow\n-  viewing of the explicitly exported repositories, via the\n-  GITWEB_EXPORT_OK build configuration variable (or the $export_ok\n-  variable in gitweb config file). If it evaluates to true, gitweb\n-  shows repositories only if this file exists in its object database\n-  (if directory has the magic file named $export_ok).\n-\n-- Finally, it is possible to specify an arbitrary perl subroutine that\n-  will be called for each project to determine if it can be exported.\n-  The subroutine receives an absolute path to the project as its only\n-  parameter.\n-\n-  For example, if you use mod_perl to run the script, and have dumb\n-  http protocol authentication configured for your repositories, you\n-  can use the following hook to allow access only if the user is\n-  authorized to read the files:\n-\n-    $export_auth_hook = sub {\n-        use Apache2::SubRequest ();\n-        use Apache2::Const -compile => qw(HTTP_OK);\n-        my $path = \"$_[0]/HEAD\";\n-        my $r    = Apache2::RequestUtil->request;\n-        my $sub  = $r->lookup_file($path);\n-        return $sub->filename eq $path\n-            && $sub->status == Apache2::Const::HTTP_OK;\n-    };\n-\n-\n-Generating projects list using gitweb\n-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n-\n-We assume that GITWEB_CONFIG has its default Makefile value, namely\n-gitweb_config.perl. Put the following in gitweb_make_index.perl file:\n-\n-\t$GITWEB_CONFIG = \"gitweb_config.perl\";\n-\tdo $GITWEB_CONFIG if -e $GITWEB_CONFIG;\n-\n-\t$projects_list = $projectroot;\n-\n-Then create the following script to get list of project in the format\n-suitable for GITWEB_LIST build configuration variable (or\n-$projects_list variable in gitweb config):\n-\n-\t#!/bin/sh\n-\n-\texport GITWEB_CONFIG=\"gitweb_make_index.perl\"\n-\texport GATEWAY_INTERFACE=\"CGI/1.1\"\n-\texport HTTP_ACCEPT=\"*/*\"\n-\texport REQUEST_METHOD=\"GET\"\n-\texport QUERY_STRING=\"a=project_index\"\n-\n-\tperl -- /var/www/cgi-bin/gitweb.cgi\n+More advanced usage, like limiting access or visibility of repositories and\n+managing multiple roots are described on gitweb manpage.\n \n \n Example web server configuration\n ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n \n-See also \"Webserver configuration\" section in README file for gitweb\n-(in gitweb/README).\n+See also \"Webserver configuration\" and \"Advanced web server setup\" sections\n+in gitweb(1) manpage.\n \n \n - Apache2, gitweb installed as CGI script,\ndiff --git a/gitweb/README b/gitweb/README\nindex cf528d3..6da4778 100644\n--- a/gitweb/README\n+++ b/gitweb/README\n@@ -7,9 +7,18 @@ The one working on:\n From the git version 1.4.0 gitweb is bundled with git.\n \n \n+Build time gitweb configuration\n+-------------------------------\n+There are many configuration variables which affect building gitweb (among\n+others creating gitweb.cgi out of gitweb.perl by replacing placeholders such\n+as `++GIT_BINDIR++` by their build-time values).\n+\n+Building and installing gitweb is described in gitweb's INSTALL file\n+(in 'gitweb/INSTALL').\n+\n+\n Runtime gitweb configuration\n ----------------------------\n-\n Gitweb obtains configuration data from the following sources in the\n following order:\n \n@@ -44,266 +53,19 @@ as comments inside 'gitweb.cgi'.\n See also gitweb.conf(5) manpage.\n \n \n-Projects list file format\n-~~~~~~~~~~~~~~~~~~~~~~~~~\n-\n-Instead of having gitweb find repositories by scanning filesystem starting\n-from $projectroot (or $projects_list, if it points to directory), you can\n-provide list of projects by setting $projects_list to a text file with list\n-of projects (and some additional info).  This file uses the following\n-format:\n-\n-One record (for project / repository) per line, whitespace separated fields;\n-does not support (at least for now) lines continuation (newline escaping).\n-Leading and trailing whitespace are ignored, any run of whitespace can be\n-used as field separator (rules for Perl's \"split(' ', $line)\").  Keyed by\n-the first field, which is project name, i.e. path to repository GIT_DIR\n-relative to $projectroot.  Fields use modified URI encoding, defined in\n-RFC 3986, section 2.1 (Percent-Encoding), or rather \"Query string encoding\"\n-(see http://en.wikipedia.org/wiki/Query_string#URL_encoding), the difference\n-being that SP (' ') can be encoded as '+' (and therefore '+' has to be also\n-percent-encoded).  Reserved characters are: '%' (used for encoding), '+'\n-(can be used to encode SPACE), all whitespace characters as defined in Perl,\n-including SP, TAB and LF, (used to separate fields in a record).\n-\n-Currently list of fields is\n- * <repository path>  - path to repository GIT_DIR, relative to $projectroot\n- * <repository owner> - displayed as repository owner, preferably full name,\n-                        or email, or both\n-\n-You can additionally use $projects_list file to limit which repositories\n-are visible, and together with $strict_export to limit access to\n-repositories (see \"Gitweb repositories\" section in gitweb/INSTALL).\n-\n-\n-Per-repository gitweb configuration\n-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n-\n-You can also configure individual repositories shown in gitweb by creating\n-file in the GIT_DIR of git repository, or by setting some repo configuration\n-variable (in GIT_DIR/config).\n-\n-You can use the following files in repository:\n- * README.html\n-   A .html file (HTML fragment) which is included on the gitweb project\n-   summary page inside <div> block element. You can use it for longer\n-   description of a project, to provide links (for example to project's\n-   homepage), etc. This is recognized only if XSS prevention is off\n-   ($prevent_xss is false); a way to include a readme safely when XSS\n-   prevention is on may be worked out in the future.\n- * description (or gitweb.description)\n-   Short (shortened by default to 25 characters in the projects list page)\n-   single line description of a project (of a repository). Plain text file;\n-   HTML will be escaped. By default set to\n-     Unnamed repository; edit this file to name it for gitweb.\n-   from the template during repository creation. You can use the\n-   gitweb.description repo configuration variable, but the file takes\n-   precedence.\n- * category (or gitweb.category)\n-   Singe line category of a project, used to group projects if\n-   $projects_list_group_categories is enabled. By default (file and\n-   configuration variable absent), uncategorized projects are put in\n-   the $project_list_default_category category. You can use the\n-   gitweb.category repo configuration variable, but the file takes\n-   precedence.\n- * cloneurl (or multiple-valued gitweb.url)\n-   File with repository URL (used for clone and fetch), one per line.\n-   Displayed in the project summary page. You can use multiple-valued\n-   gitweb.url repository configuration variable for that, but the file\n-   takes precedence.\n- * gitweb.owner\n-   You can use the gitweb.owner repository configuration variable to set\n-   repository's owner. It is displayed in the project list and summary\n-   page. If it's not set, filesystem directory's owner is used\n-   (via GECOS field / real name field from getpwiud(3)).\n- * various gitweb.* config variables (in config)\n-   Read description of %feature hash for detailed list, and some\n-   descriptions.\n-\n-\n-Webserver configuration\n------------------------\n-\n-If you want to have one URL for both gitweb and your http://\n-repositories, you can configure apache like this:\n-\n-<VirtualHost *:80>\n-    ServerName\t\tgit.example.org\n-    DocumentRoot\t/pub/git\n-    SetEnv\t\t\tGITWEB_CONFIG\t/etc/gitweb.conf\n-\n-    # turning on mod rewrite\n-    RewriteEngine on\n-\n-    # make the front page an internal rewrite to the gitweb script\n-    RewriteRule ^/$  /cgi-bin/gitweb.cgi\n-\n-    # make access for \"dumb clients\" work\n-    RewriteRule ^/(.*\\.git/(?!/?(HEAD|info|objects|refs)).*)?$ /cgi-bin/gitweb.cgi%{REQUEST_URI}  [L,PT]\n-</VirtualHost>\n-\n-The above configuration expects your public repositories to live under\n-/pub/git and will serve them as http://git.domain.org/dir-under-pub-git,\n-both as cloneable GIT URL and as browseable gitweb interface.\n-If you then start your git-daemon with --base-path=/pub/git --export-all\n-then you can even use the git:// URL with exactly the same path.\n-\n-Setting the environment variable GITWEB_CONFIG will tell gitweb to use\n-the named file (i.e. in this example /etc/gitweb.conf) as a\n-configuration for gitweb.  Perl variables defined in here will\n-override the defaults given at the head of the gitweb.perl (or\n-gitweb.cgi).  Look at the comments in that file for information on\n-which variables and what they mean.\n-\n-If you use the rewrite rules from the example you'll likely also need\n-something like the following in your gitweb.conf (or gitweb_config.perl) file:\n-\n-  @stylesheets = (\"/some/absolute/path/gitweb.css\");\n-  $my_uri = \"/\";\n-  $home_link = \"/\";\n-\n-\n-Webserver configuration with multiple projects' root\n-----------------------------------------------------\n-\n-If you want to use gitweb with several project roots you can edit your apache\n-virtual host and gitweb.conf configuration files like this :\n-\n-virtual host configuration :\n-\n-<VirtualHost *:80>\n-    ServerName\t\t\tgit.example.org\n-    DocumentRoot\t\t/pub/git\n-    SetEnv\t\t\t\tGITWEB_CONFIG\t/etc/gitweb.conf\n-\n-    # turning on mod rewrite\n-    RewriteEngine on\n-\n-    # make the front page an internal rewrite to the gitweb script\n-    RewriteRule ^/$ \t\t/cgi-bin/gitweb.cgi [QSA,L,PT]\n-\n-    # look for a public_git folder in unix users' home\n-    # http://git.example.org/~<user>/\n-    RewriteRule ^/\\~([^\\/]+)(/|/gitweb.cgi)?$\t/cgi-bin/gitweb.cgi [QSA,E=GITWEB_PROJECTROOT:/home/$1/public_git/,L,PT]\n-\n-    # http://git.example.org/+<user>/\n-    #RewriteRule ^/\\+([^\\/]+)(/|/gitweb.cgi)?$\t/cgi-bin/gitweb.cgi [QSA,E=GITWEB_PROJECTROOT:/home/$1/public_git/,L,PT]\n-\n-    # http://git.example.org/user/<user>/\n-    #RewriteRule ^/user/([^\\/]+)/(gitweb.cgi)?$\t/cgi-bin/gitweb.cgi [QSA,E=GITWEB_PROJECTROOT:/home/$1/public_git/,L,PT]\n-\n-    # defined list of project roots\n-    RewriteRule ^/scm(/|/gitweb.cgi)?$\t\t/cgi-bin/gitweb.cgi [QSA,E=GITWEB_PROJECTROOT:/pub/scm/,L,PT]\n-    RewriteRule ^/var(/|/gitweb.cgi)?$\t\t/cgi-bin/gitweb.cgi [QSA,E=GITWEB_PROJECTROOT:/var/git/,L,PT]\n-\n-    # make access for \"dumb clients\" work\n-    RewriteRule ^/(.*\\.git/(?!/?(HEAD|info|objects|refs)).*)?$ /cgi-bin/gitweb.cgi%{REQUEST_URI}  [L,PT]\n-</VirtualHost>\n-\n-gitweb.conf configuration :\n-\n-$projectroot = $ENV{'GITWEB_PROJECTROOT'} || \"/pub/git\";\n-\n-These configurations enable two things. First, each unix user (<user>) of the\n-server will be able to browse through gitweb git repositories found in\n-~/public_git/ with the following url : http://git.example.org/~<user>/\n-\n-If you do not want this feature on your server just remove the second rewrite rule.\n-\n-If you already use mod_userdir in your virtual host or you don't want to use\n-the '~' as first character just comment or remove the second rewrite rule and\n-uncomment one of the following according to what you want.\n-\n-Second, repositories found in /pub/scm/ and /var/git/ will be accesible\n-through http://git.example.org/scm/ and http://git.example.org/var/.\n-You can add as many project roots as you want by adding rewrite rules like the\n-third and the fourth.\n-\n-\n-PATH_INFO usage\n------------------------\n-If you enable PATH_INFO usage in gitweb by putting\n-\n-   $feature{'pathinfo'}{'default'} = [1];\n-\n-in your gitweb.conf, it is possible to set up your server so that it\n-consumes and produces URLs in the form\n-\n-http://git.example.com/project.git/shortlog/sometag\n-\n-by using a configuration such as the following, that assumes that\n-/var/www/gitweb is the DocumentRoot of your webserver, and that it\n-contains the gitweb.cgi script and complementary static files\n-(stylesheet, favicon):\n-\n-<VirtualHost *:80>\n-\tServerAlias git.example.com\n-\n-\tDocumentRoot /var/www/gitweb\n-\n-\t<Directory /var/www/gitweb>\n-\t\tOptions ExecCGI\n-\t\tAddHandler cgi-script cgi\n-\n-\t\tDirectoryIndex gitweb.cgi\n-\n-\t\tRewriteEngine On\n-\t\tRewriteCond %{REQUEST_FILENAME} !-f\n-\t\tRewriteCond %{REQUEST_FILENAME} !-d\n-\t\tRewriteRule ^.* /gitweb.cgi/$0 [L,PT]\n-\t</Directory>\n-</VirtualHost>\n-\n-The rewrite rule guarantees that existing static files will be properly\n-served, whereas any other URL will be passed to gitweb as PATH_INFO\n-parameter.\n-\n-Notice that in this case you don't need special settings for\n-@stylesheets, $my_uri and $home_link, but you lose \"dumb client\" access\n-to your project .git dirs. A possible workaround for the latter is the\n-following: in your project root dir (e.g. /pub/git) have the projects\n-named without a .git extension (e.g. /pub/git/project instead of\n-/pub/git/project.git) and configure Apache as follows:\n-\n-<VirtualHost *:80>\n-\tServerAlias git.example.com\n-\n-\tDocumentRoot /var/www/gitweb\n-\n-\tAliasMatch ^(/.*?)(\\.git)(/.*)?$ /pub/git$1$3\n-\t<Directory /var/www/gitweb>\n-\t\tOptions ExecCGI\n-\t\tAddHandler cgi-script cgi\n-\n-\t\tDirectoryIndex gitweb.cgi\n-\n-\t\tRewriteEngine On\n-\t\tRewriteCond %{REQUEST_FILENAME} !-f\n-\t\tRewriteCond %{REQUEST_FILENAME} !-d\n-\t\tRewriteRule ^.* /gitweb.cgi/$0 [L,PT]\n-\t</Directory>\n-</VirtualHost>\n-\n-The additional AliasMatch makes it so that\n-\n-http://git.example.com/project.git\n-\n-will give raw access to the project's git dir (so that the project can\n-be cloned), while\n-\n-http://git.example.com/project\n-\n-will provide human-friendly gitweb access.\n-\n-This solution is not 100% bulletproof, in the sense that if some project\n-has a named ref (branch, tag) starting with 'git/', then paths such as\n-\n-http://git.example.com/project/command/abranch..git/abranch\n-\n-will fail with a 404 error.\n+Web server configuration\n+------------------------\n+Gitweb can be run as CGI script, as legacy mod_perl application (using\n+ModPerl::Registry), and as FastCGI script.  You can find some simple examples\n+in \"Example web server configuration\" section in INSTALL file for gitweb (in\n+gitweb/INSTALL).\n \n+See \"Webserver configuration\" and \"Advanced web server setup\" sections in\n+gitweb(1) manpage.\n \n \n+AUTHORS\n+-------\n Originally written by:\n   Kay Sievers <kay.sievers@vrfy.org>\n \n-- \n1.7.6\n"},{"id":"177245","messageId":"1318098723-12813-5-git-send-email-jnareb@gmail.com","threadId":"28634","inReplyTo":"1318098723-12813-1-git-send-email-jnareb@gmail.com","subject":"[PATCHv5 4/6] Documentation: Link to gitweb(1) and gitweb.conf(5) in other manpages","fromName":"Jakub Narebski","fromEmail":"jnareb@gmail.com","sentAt":"2011-10-08T18:32:01Z","receivedAt":"2011-10-08T18:32:01Z","isPatch":false,"sender":{"key":"jnareb@gmail.com","avatar":"https://avatars.githubusercontent.com/u/2706?v=4"},"body":"Add link to gitweb(1) in \"SEE ALSO\" section of git-instaweb(1) manpage,\nand \"Ancillary Commands\" section of git(1) manpage (the latter by the\nway of command-list.txt file).\n\nSigned-off-by: Jakub Narebski <jnareb@gmail.com>\n---\nThis is new in this series.\n\nBTW. why command-list.txt uses not only spaces to separate and align,\nbut also tabs, and mixtures of tabs and spaces???\n\n Documentation/git-instaweb.txt |    4 ++++\n command-list.txt               |    1 +\n 2 files changed, 5 insertions(+), 0 deletions(-)\n\ndiff --git a/Documentation/git-instaweb.txt b/Documentation/git-instaweb.txt\nindex ea95c90..f3eef51 100644\n--- a/Documentation/git-instaweb.txt\n+++ b/Documentation/git-instaweb.txt\n@@ -84,6 +84,10 @@ If the configuration variable 'instaweb.browser' is not set,\n 'web.browser' will be used instead if it is defined. See\n linkgit:git-web{litdd}browse[1] for more information about this.\n \n+SEE ALSO\n+--------\n+linkgit:gitweb[1]\n+\n GIT\n ---\n Part of the linkgit:git[1] suite\ndiff --git a/command-list.txt b/command-list.txt\nindex 95bf18c..a36ee9b 100644\n--- a/command-list.txt\n+++ b/command-list.txt\n@@ -130,5 +130,6 @@ git-upload-pack                         synchelpers\n git-var                                 plumbinginterrogators\n git-verify-pack                         plumbinginterrogators\n git-verify-tag                          ancillaryinterrogators\n+gitweb                                  ancillaryinterrogators\n git-whatchanged                         ancillaryinterrogators\n git-write-tree                          plumbingmanipulators\n-- \n1.7.6\n"},{"id":"177246","messageId":"1318098723-12813-6-git-send-email-jnareb@gmail.com","threadId":"28634","inReplyTo":"1318098723-12813-1-git-send-email-jnareb@gmail.com","subject":"[PATCHv5 5/6] Documentation: Add gitweb config variables to git-config(1)","fromName":"Jakub Narebski","fromEmail":"jnareb@gmail.com","sentAt":"2011-10-08T18:32:02Z","receivedAt":"2011-10-08T18:32:02Z","isPatch":false,"sender":{"key":"jnareb@gmail.com","avatar":"https://avatars.githubusercontent.com/u/2706?v=4"},"body":"Add a list of gitweb config variables to git-config(1) manpage, just\nlinking to gitweb(1) or gitweb.conf(5).\n\nSigned-off-by: Jakub Narebski <jnareb@gmail.com>\n---\nThis patch is new in this series.\n\nBTW. there was a patch from Thomas Rast, which you can see e.g. in\n't/doc-config-extraction' branch in my repositories:\n\n  http://repo.or.cz/w/git/jnareb-git.git\n  https://github.com/jnareb/git\n\nwhich made git generate such thing automatically.\n\n Documentation/config.txt |   17 +++++++++++++++++\n 1 files changed, 17 insertions(+), 0 deletions(-)\n\ndiff --git a/Documentation/config.txt b/Documentation/config.txt\nindex 03296b7..b30c7e6 100644\n--- a/Documentation/config.txt\n+++ b/Documentation/config.txt\n@@ -1071,6 +1071,23 @@ All gitcvs variables except for 'gitcvs.usecrlfattr' and\n is one of \"ext\" and \"pserver\") to make them apply only for the given\n access method.\n \n+gitweb.category::\n+gitweb.description::\n+gitweb.owner::\n+gitweb.url::\n+\tSee linkgit:gitweb[1] for description.\n+\n+gitweb.avatar::\n+gitweb.blame::\n+gitweb.grep::\n+gitweb.highlight::\n+gitweb.patches::\n+gitweb.pickaxe::\n+gitweb.remote_heads::\n+gitweb.showsizes::\n+gitweb.snapshot::\n+\tSee linkgit:gitweb.conf[5] for description.\n+\n grep.lineNumber::\n \tIf set to true, enable '-n' option by default.\n \n-- \n1.7.6\n"},{"id":"177247","messageId":"1318098723-12813-7-git-send-email-jnareb@gmail.com","threadId":"28634","inReplyTo":"1318098723-12813-1-git-send-email-jnareb@gmail.com","subject":"[PATCHv5 6/6] gitweb: Add gitweb manpages to 'gitweb' package in git.spec","fromName":"Jakub Narebski","fromEmail":"jnareb@gmail.com","sentAt":"2011-10-08T18:32:03Z","receivedAt":"2011-10-08T18:32:03Z","isPatch":false,"sender":{"key":"jnareb@gmail.com","avatar":"https://avatars.githubusercontent.com/u/2706?v=4"},"body":"This patch follows similar lines in %files section for 'gitk' and\n'git-gui' subpackages.\n\nSigned-off-by: Jakub Narebski <jnareb@gmail.com>\n---\nThis version adds gitweb's README and INSTALL to 'gitweb' subpackage.\n\n git.spec.in |    7 +++++++\n 1 files changed, 7 insertions(+), 0 deletions(-)\n\ndiff --git a/git.spec.in b/git.spec.in\nindex 91c8462..c562c62 100644\n--- a/git.spec.in\n+++ b/git.spec.in\n@@ -199,7 +199,11 @@ rm -rf $RPM_BUILD_ROOT\n \n %files -n gitweb\n %defattr(-,root,root)\n+%doc gitweb/README gitweb/INSTALL Documentation/*gitweb*.txt\n %{_datadir}/gitweb\n+%{!?_without_docs: %{_mandir}/man1/*gitweb*.1*}\n+%{!?_without_docs: %{_mandir}/man5/*gitweb*.5*}\n+%{!?_without_docs: %doc Documentation/*gitweb*.html }\n \n %files -n perl-Git -f perl-files\n %defattr(-,root,root)\n@@ -208,6 +212,9 @@ rm -rf $RPM_BUILD_ROOT\n # No files for you!\n \n %changelog\n+* Sun Sep 18 2011 Jakub Narebski <jnareb@gmail.com>\n+- Add gitweb manpages to 'gitweb' subpackage\n+\n * Wed Jun 30 2010 Junio C Hamano <gitster@pobox.com>\n - Add 'gitweb' subpackage.\n \n-- \n1.7.6\n"},{"id":"177328","messageId":"7v39f0lg44.fsf@alter.siamese.dyndns.org","threadId":"28634","inReplyTo":"1318098723-12813-1-git-send-email-jnareb@gmail.com","subject":"Re: [PATCHv5/RFC 0/6] Moving gitweb documentation to manpages","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2011-10-10T18:47:23Z","receivedAt":"2011-10-10T18:47:23Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Thanks for working on this.\n"},{"id":"177330","messageId":"7vwrcck1jm.fsf@alter.siamese.dyndns.org","threadId":"28634","inReplyTo":"1318098723-12813-2-git-send-email-jnareb@gmail.com","subject":"Re: [PATCHv5/RFC 1/6] Documentation: Preparation for gitweb manpages","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2011-10-10T18:53:14Z","receivedAt":"2011-10-10T18:53:14Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jakub Narebski <jnareb@gmail.com> writes:\n\n> This patch adds infrastructure for easy generation of only\n> gitweb-related manpages.  It adds a currently empty 'gitweb-doc'\n> target to Documentation/Makefile, and a 'doc' proxy target to\n> gitweb/Makefile.\n\nI tend to agree with your after-three-dash comment that this separation is\nnot necessary, it may be expedient while working on the series, but wants\nto be removed once the series is complete.\n\n> This way to build only gitweb documentation in both 'man' and 'html'\n> formats one can use\n>\n>   make -C gitweb doc\n>\n> or\n>\n>   cd gitweb; make doc\n>\n> This somewhat follows the idea of 'full-svn-test' and 'gitweb-test' in\n> t/Makefile.\n\nIt seems that this follows the idea backward in that the existing practice\nfo full-svn-test (and valgrind test) is to allow _excluding_ stuff that\nthe user may not care about or the user cannot afford to run; in that\nsense 'gitweb-test' target is also backwards.\n\n> gitweb manpages would reside in the gitweb/ directory, \"make doc\"\n> would invoke \"make -C gitweb doc\" to generate formatted docs.\n>\n> The gitweb.conf(5) and gitweb(1) manpages will be added in subsequent\n> commits.\n>\n> [Commit message improved with help of Jonathan Nieder]\n>\n> Signed-off-by: Jakub Narebski <jnareb@gmail.com>\n> ---\n> This commit is not strictly necessary: it only adds \"doc\" target to\n> gitweb/Makefile, and \"gitweb-doc\" target to Documentation/Makefile;\n> neither is run when e.g. generating RPM.\n>\n> They are here because they would be here if documentation source was\n> kept along with gitweb script in the 'gitweb/' subdirectory, and to\n> make it easier and faster to test the changes.\n>\n>  Documentation/Makefile |    3 +++\n>  gitweb/Makefile        |    7 ++++++-\n>  2 files changed, 9 insertions(+), 1 deletions(-)\n>\n> diff --git a/Documentation/Makefile b/Documentation/Makefile\n> index 6346a75..44be67b 100644\n> --- a/Documentation/Makefile\n> +++ b/Documentation/Makefile\n> @@ -170,6 +170,9 @@ info: git.info gitman.info\n>  \n>  pdf: user-manual.pdf\n>  \n> +GITWEB_DOC = $(filter gitweb.%,$(DOC_HTML) $(DOC_MAN1) $(DOC_MAN5) $(DOC_MAN7))\n> +gitweb-doc: $(GITWEB_DOC)\n> +\n>  install: install-man\n>  \n>  install-man: man\n> diff --git a/gitweb/Makefile b/gitweb/Makefile\n> index 1c85b5f..3014d80 100644\n> --- a/gitweb/Makefile\n> +++ b/gitweb/Makefile\n> @@ -174,6 +174,11 @@ test-installed:\n>  \tGITWEB_TEST_INSTALLED='$(DESTDIR_SQ)$(gitwebdir_SQ)' \\\n>  \t\t$(MAKE) -C ../t gitweb-test\n>  \n> +### Documentation\n> +\n> +doc:\n> +\t$(MAKE) -C ../Documentation gitweb-doc\n> +\n>  ### Installation rules\n>  \n>  install: all\n> @@ -187,5 +192,5 @@ install: all\n>  clean:\n>  \t$(RM) gitweb.cgi static/gitweb.min.js static/gitweb.min.css GITWEB-BUILD-OPTIONS\n>  \n> -.PHONY: all clean install test test-installed .FORCE-GIT-VERSION-FILE FORCE\n> +.PHONY: all clean install test test-installed doc .FORCE-GIT-VERSION-FILE FORCE\n"},{"id":"177329","messageId":"7vr52kk1jj.fsf@alter.siamese.dyndns.org","threadId":"28634","inReplyTo":"1318098723-12813-4-git-send-email-jnareb@gmail.com","subject":"Re: [PATCHv5/RFC 3/6] gitweb: Add manpage for gitweb","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2011-10-10T18:56:34Z","receivedAt":"2011-10-10T18:56:34Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jakub Narebski <jnareb@gmail.com> writes:\n\n> diff --git a/Documentation/gitweb.txt b/Documentation/gitweb.txt\n> new file mode 100644\n> index 0000000..2acdb3b\n> --- /dev/null\n> +++ b/Documentation/gitweb.txt\n> @@ -0,0 +1,703 @@\n> +gitweb(1)\n> +=========\n> +\n> +NAME\n> +----\n> +gitweb - Git web interface (web frontend to Git repositories)\n> +\n> +SYNOPSIS\n> +--------\n> +To get started with gitweb, run linkgit:git-instaweb[1] from a git repository.\n> +This would configure and start your web server, and run web browser pointing to\n> +gitweb page.\n> +\n> +See http://git.kernel.org/?p=git/git.git;a=tree;f=gitweb[] or\n> +http://repo.or.cz/w/git.git/tree/HEAD:/gitweb/[] for gitweb source code,\n> +browsed using gitweb itself.\n\nThis doesn't quite look like a \"SYNOPSIS\" section. Shouldn't everything\nafter the first line be at the beginning of \"DESCRIPTION\"?\n"},{"id":"177333","messageId":"201110102352.25456.jnareb@gmail.com","threadId":"28634","inReplyTo":"7vwrcck1jm.fsf@alter.siamese.dyndns.org","subject":"Re: [PATCHv5/RFC 1/6] Documentation: Preparation for gitweb manpages","fromName":"Jakub Narebski","fromEmail":"jnareb@gmail.com","sentAt":"2011-10-10T21:52:24Z","receivedAt":"2011-10-10T21:52:24Z","isPatch":false,"sender":{"key":"jnareb@gmail.com","avatar":"https://avatars.githubusercontent.com/u/2706?v=4"},"body":"On Mon, 10 Oct 2011, Junio C Hamano wrote:\n> Jakub Narebski <jnareb@gmail.com> writes:\n> \n> > This patch adds infrastructure for easy generation of only\n> > gitweb-related manpages.  It adds a currently empty 'gitweb-doc'\n> > target to Documentation/Makefile, and a 'doc' proxy target to\n> > gitweb/Makefile.\n> \n> I tend to agree with your after-three-dash comment that this separation is\n> not necessary, it may be expedient while working on the series, but wants\n> to be removed once the series is complete.\n\nAlso it is a bit of historical remains, as in original patch by Drew\nthe manpage (the AsciiDoc source) was in 'gitweb/' directory.\n\nAnyway, I'll remove this patch from the future versions of this patch\nseries (if there would be need for next version).\n\n[...]\n> > ---\n> > This commit is not strictly necessary: it only adds \"doc\" target to\n> > gitweb/Makefile, and \"gitweb-doc\" target to Documentation/Makefile;\n> > neither is run when e.g. generating RPM.\n> >\n> > They are here because they would be here if documentation source was\n> > kept along with gitweb script in the 'gitweb/' subdirectory, and to\n> > make it easier and faster to test the changes.\n\n-- \nJakub Narebski\nPoland\n"},{"id":"177334","messageId":"201110110002.24665.jnareb@gmail.com","threadId":"28634","inReplyTo":"7vr52kk1jj.fsf@alter.siamese.dyndns.org","subject":"Re: [PATCHv5/RFC 3/6] gitweb: Add manpage for gitweb","fromName":"Jakub Narebski","fromEmail":"jnareb@gmail.com","sentAt":"2011-10-10T22:02:24Z","receivedAt":"2011-10-10T22:02:24Z","isPatch":false,"sender":{"key":"jnareb@gmail.com","avatar":"https://avatars.githubusercontent.com/u/2706?v=4"},"body":"On Mon, 10 Oct 2011, Junio C Hamano wrote:\n> Jakub Narebski <jnareb@gmail.com> writes:\n> \n> > diff --git a/Documentation/gitweb.txt b/Documentation/gitweb.txt\n> > new file mode 100644\n> > index 0000000..2acdb3b\n> > --- /dev/null\n> > +++ b/Documentation/gitweb.txt\n> > @@ -0,0 +1,703 @@\n> > +gitweb(1)\n> > +=========\n> > +\n> > +NAME\n> > +----\n> > +gitweb - Git web interface (web frontend to Git repositories)\n> > +\n> > +SYNOPSIS\n> > +--------\n> > +To get started with gitweb, run linkgit:git-instaweb[1] from a git repository.\n> > +This would configure and start your web server, and run web browser pointing to\n> > +gitweb page.\n> > +\n> > +See http://git.kernel.org/?p=git/git.git;a=tree;f=gitweb[] or\n> > +http://repo.or.cz/w/git.git/tree/HEAD:/gitweb/[] for gitweb source code,\n> > +browsed using gitweb itself.\n> \n> This doesn't quite look like a \"SYNOPSIS\" section. Shouldn't everything\n> after the first line be at the beginning of \"DESCRIPTION\"?\n\nDid you mean something like (it would have to be slightly adjusted,\nof course):\n \n    +SYNOPSIS\n    +--------\n    +To get started with gitweb, run linkgit:git-instaweb[1] from a git repository.\n    +\n    +DESCRIPTION\n    +-----------\n    +This would configure and start your web server, and run web browser pointing to\n    +gitweb page.\n\nThe problem is that catering to old AsciiDoc (but still used by some of\nlong-term-support Linux distributions) requires to have \"SYNOPSIS\"\nsection... but there is no natural synopsis for non self-hostable web\napplication, is there?\n\n-- \nJakub Narebski\nPoland\n"},{"id":"177335","messageId":"20111010221811.GA21367@elie.hsd1.il.comcast.net","threadId":"28634","inReplyTo":"201110110002.24665.jnareb@gmail.com","subject":"Re: [PATCHv5/RFC 3/6] gitweb: Add manpage for gitweb","fromName":"Jonathan Nieder","fromEmail":"jrnieder@gmail.com","sentAt":"2011-10-10T22:18:11Z","receivedAt":"2011-10-10T22:18:11Z","isPatch":false,"sender":{"key":"jrnieder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/281595?v=4"},"body":"Jakub Narebski wrote:\n\n> The problem is that catering to old AsciiDoc (but still used by some of\n> long-term-support Linux distributions) requires to have \"SYNOPSIS\"\n> section... but there is no natural synopsis for non self-hostable web\n> application, is there?\n\nI personally think something like\n\n\tSYNOPSIS\n\t--------\n\t/usr/share/gitweb/gitweb.cgi\n\tgit instaweb\n\nor perhaps something like\n\n\tSYNOPSIS\n\t--------\n\thttp://<site>/?p=<project>.git;a=<action>;h=<object>;<parameters>\n\thttp://<site>/<project>/<action>/<object>?<parameters>\n\nwould be best.\n"},{"id":"177339","messageId":"7v62jwjvdk.fsf@alter.siamese.dyndns.org","threadId":"28634","inReplyTo":"201110102352.25456.jnareb@gmail.com","subject":"Re: [PATCHv5/RFC 1/6] Documentation: Preparation for gitweb manpages","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2011-10-10T23:10:31Z","receivedAt":"2011-10-10T23:10:31Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"I probably do not have time to look into this, but just FYI my trial merge\nto 'pu' of this topic is failing like this:\n\nasciidoc: ERROR: gitweb.conf.txt: line 484: illegal style name: Default: ()\nasciidoc: ERROR: gitweb.conf.txt: line 494: illegal style name: Default: 300\n"},{"id":"177366","messageId":"1318338135.22324.33.camel@drew-northup.unet.maine.edu","threadId":"28634","inReplyTo":"20111010221811.GA21367@elie.hsd1.il.comcast.net","subject":"Re: [PATCHv5/RFC 3/6] gitweb: Add manpage for gitweb","fromName":"Drew Northup","fromEmail":"drew.northup@maine.edu","sentAt":"2011-10-11T13:02:15Z","receivedAt":"2011-10-11T13:02:15Z","isPatch":false,"sender":{"key":"drew.northup@maine.edu","avatar":"https://avatars.githubusercontent.com/u/18331571?v=4"},"body":"On Mon, 2011-10-10 at 17:18 -0500, Jonathan Nieder wrote:\n> Jakub Narebski wrote:\n> \n> > The problem is that catering to old AsciiDoc (but still used by some of\n> > long-term-support Linux distributions) requires to have \"SYNOPSIS\"\n> > section... but there is no natural synopsis for non self-hostable web\n> > application, is there?\n> \n> I personally think something like\n> \n> \tSYNOPSIS\n> \t--------\n> \t/usr/share/gitweb/gitweb.cgi\n> \tgit instaweb\n> \n> or perhaps something like\n> \n> \tSYNOPSIS\n> \t--------\n> \thttp://<site>/?p=<project>.git;a=<action>;h=<object>;<parameters>\n> \thttp://<site>/<project>/<action>/<object>?<parameters>\n> \n> would be best.\n\nThis would be why I included a synopsis with my original submission. As\nthis was supposed to be a description of the configuration files of said\napplication it does not make much sense to put the executable in the\nsynopsis. Please forgive me for attempting to make sense!\n\n-- \n-Drew Northup\n________________________________________________\n\"As opposed to vegetable or mineral error?\"\n-John Pescatore, SANS NewsBites Vol. 12 Num. 59\n"},{"id":"177367","messageId":"201110111551.09621.jnareb@gmail.com","threadId":"28634","inReplyTo":"1318338135.22324.33.camel@drew-northup.unet.maine.edu","subject":"Re: [PATCHv5/RFC 3/6] gitweb: Add manpage for gitweb","fromName":"Jakub Narebski","fromEmail":"jnareb@gmail.com","sentAt":"2011-10-11T13:51:08Z","receivedAt":"2011-10-11T13:51:08Z","isPatch":false,"sender":{"key":"jnareb@gmail.com","avatar":"https://avatars.githubusercontent.com/u/2706?v=4"},"body":"On Tue, 11 Oct 2011, Drew Northup wrote:\n> On Mon, 2011-10-10 at 17:18 -0500, Jonathan Nieder wrote:\n> > Jakub Narebski wrote:\n> > \n> > > The problem is that catering to old AsciiDoc (but still used by some of\n> > > long-term-support Linux distributions) requires to have \"SYNOPSIS\"\n> > > section... but there is no natural synopsis for non self-hostable web\n> > > application, is there?\n> > \n> > I personally think something like\n> > \n> > \tSYNOPSIS\n> > \t--------\n> > \t/usr/share/gitweb/gitweb.cgi\n> > \tgit instaweb\n> > \n> > or perhaps something like\n> > \n> > \tSYNOPSIS\n> > \t--------\n> > \thttp://<site>/?p=<project>.git;a=<action>;h=<object>;<parameters>\n> > \thttp://<site>/<project>/<action>/<object>?<parameters>\n> > \n> > would be best.\n> \n> This would be why I included a synopsis with my original submission. As\n> this was supposed to be a description of the configuration files of said\n> application it does not make much sense to put the executable in the\n> synopsis. Please forgive me for attempting to make sense!\n\nBut this manpage is about _gitweb itself_, not about gitweb config file(s).\nGitweb itself is application, though it is not runnable directly (yet).\n\nWeb apps either don't use manpages as documentation, and those that do\nthat I found (SVN::Web for example) include runnable server-starting script.\n-- \nJakub Narebski\nPoland\n"},{"id":"177369","messageId":"1318341714.22324.46.camel@drew-northup.unet.maine.edu","threadId":"28634","inReplyTo":"201110111551.09621.jnareb@gmail.com","subject":"Re: [PATCHv5/RFC 3/6] gitweb: Add manpage for gitweb (APPLICATION!!!)","fromName":"Drew Northup","fromEmail":"drew.northup@maine.edu","sentAt":"2011-10-11T14:01:54Z","receivedAt":"2011-10-11T14:01:54Z","isPatch":false,"sender":{"key":"drew.northup@maine.edu","avatar":"https://avatars.githubusercontent.com/u/18331571?v=4"},"body":"On Tue, 2011-10-11 at 15:51 +0200, Jakub Narebski wrote:\n> On Tue, 11 Oct 2011, Drew Northup wrote:\n\n> > This would be why I included a synopsis with my original submission. As\n> > this was supposed to be a description of the configuration files of said\n> > application it does not make much sense to put the executable in the\n> > synopsis. Please forgive me for attempting to make sense!\n> \n> But this manpage is about _gitweb itself_, not about gitweb config file(s).\n> Gitweb itself is application, though it is not runnable directly (yet).\n> \n> Web apps either don't use manpages as documentation, and those that do\n> that I found (SVN::Web for example) include runnable server-starting script.\n\nHmm, Couldn't tell from the mail header _which_ we were talking about in\nthis subthread. I'll have to read the _whole_ patch apparently next\ntime.\n\nCrawling back into my cave...\n\n-- \n-Drew Northup\n________________________________________________\n\"As opposed to vegetable or mineral error?\"\n-John Pescatore, SANS NewsBites Vol. 12 Num. 59\n"},{"id":"177371","messageId":"201110111620.12788.jnareb@gmail.com","threadId":"28634","inReplyTo":"1318341714.22324.46.camel@drew-northup.unet.maine.edu","subject":"Re: [PATCHv5/RFC 3/6] gitweb: Add manpage for gitweb (APPLICATION!!!)","fromName":"Jakub Narebski","fromEmail":"jnareb@gmail.com","sentAt":"2011-10-11T14:20:12Z","receivedAt":"2011-10-11T14:20:12Z","isPatch":false,"sender":{"key":"jnareb@gmail.com","avatar":"https://avatars.githubusercontent.com/u/2706?v=4"},"body":"On Tue, 11 Oct 2011, Drew Northup wrote:\n> On Tue, 2011-10-11 at 15:51 +0200, Jakub Narebski wrote:\n> > On Tue, 11 Oct 2011, Drew Northup wrote:\n> \n> > > This would be why I included a synopsis with my original submission. As\n> > > this was supposed to be a description of the configuration files of said\n> > > application it does not make much sense to put the executable in the\n> > > synopsis. Please forgive me for attempting to make sense!\n> > \n> > But this manpage is about _gitweb itself_, not about gitweb config file(s).\n> > Gitweb itself is application, though it is not runnable directly (yet).\n> > \n> > Web apps either don't use manpages as documentation, and those that do\n> > that I found (SVN::Web for example) include runnable server-starting script.\n> \n> Hmm, Couldn't tell from the mail header _which_ we were talking about in\n> this subthread. I'll have to read the _whole_ patch apparently next\n> time.\n\nI'm sorry.  I guess better subjects would be:\n\n  gitweb: Add gitweb.conf(5) manpage\n  gitweb: Add gitweb(1) manpage\n\ninstead of current\n\n  gitweb: Add manpage for gitweb configuration files\n  gitweb: Add manpage for gitweb\n\nOr perhaps:\n\n  gitweb: Add manpage for gitweb configuration files\n  gitweb: Add manpage for gitweb itself\n\n-- \nJakub Narebski\nPoland\n"},{"id":"177372","messageId":"201110111739.49967.jnareb@gmail.com","threadId":"28634","inReplyTo":"7v62jwjvdk.fsf@alter.siamese.dyndns.org","subject":"Re: [PATCHv5/RFC 1/6] Documentation: Preparation for gitweb manpages","fromName":"Jakub Narebski","fromEmail":"jnareb@gmail.com","sentAt":"2011-10-11T15:39:49Z","receivedAt":"2011-10-11T15:39:49Z","isPatch":false,"sender":{"key":"jnareb@gmail.com","avatar":"https://avatars.githubusercontent.com/u/2706?v=4"},"body":"On Tue, 11 Oct 2011, Junio C Hamano wrote:\n\n> I probably do not have time to look into this, but just FYI my trial merge\n> to 'pu' of this topic is failing like this:\n> \n> asciidoc: ERROR: gitweb.conf.txt: line 484: illegal style name: Default: ()\n> asciidoc: ERROR: gitweb.conf.txt: line 494: illegal style name: Default: 300\n\nDamn, I thought I have fixed that.  This probably depends on AsciiDoc\nversion (\"make doc\" on 'master' generates a few _warnings_ for me related\nto similar situation), but the problem is with\n\n  [Default: <value>]\n\nthat was copied from gitweb/README.  But [<sth>] is an attribute list\n(style name in simplest form), used more often in newer AsciiDoc.\n\nSo either we have to escape '[' and ']', i.e. use {startsb} and {endsb},\nwhich would reduce human-friendliness, or move to different way of marking\ndefault values, e.g. _italic_.\n\nWhat do you think?\n-- \nJakub Narebski\nPoland\n"},{"id":"177378","messageId":"1318352213.22324.58.camel@drew-northup.unet.maine.edu","threadId":"28634","inReplyTo":"201110111620.12788.jnareb@gmail.com","subject":"Re: [PATCHv5/RFC 3/6] gitweb: Add manpage for gitweb (APPLICATION!!!)","fromName":"Drew Northup","fromEmail":"drew.northup@maine.edu","sentAt":"2011-10-11T16:56:53Z","receivedAt":"2011-10-11T16:56:53Z","isPatch":false,"sender":{"key":"drew.northup@maine.edu","avatar":"https://avatars.githubusercontent.com/u/18331571?v=4"},"body":"\nOn Tue, 2011-10-11 at 16:20 +0200, Jakub Narebski wrote:\n> On Tue, 11 Oct 2011, Drew Northup wrote:\n> > On Tue, 2011-10-11 at 15:51 +0200, Jakub Narebski wrote:\n> > > On Tue, 11 Oct 2011, Drew Northup wrote:\n> > \n> > > > This would be why I included a synopsis with my original submission. As\n> > > > this was supposed to be a description of the configuration files of said\n> > > > application it does not make much sense to put the executable in the\n> > > > synopsis. Please forgive me for attempting to make sense!\n> > > \n> > > But this manpage is about _gitweb itself_, not about gitweb config file(s).\n> > > Gitweb itself is application, though it is not runnable directly (yet).\n> > > \n> > > Web apps either don't use manpages as documentation, and those that do\n> > > that I found (SVN::Web for example) include runnable server-starting script.\n> > \n> > Hmm, Couldn't tell from the mail header _which_ we were talking about in\n> > this subthread. I'll have to read the _whole_ patch apparently next\n> > time.\n> \n> I'm sorry.  I guess better subjects would be:\n> \n>   gitweb: Add gitweb.conf(5) manpage\n>   gitweb: Add gitweb(1) manpage\n> \n> instead of current\n> \n>   gitweb: Add manpage for gitweb configuration files\n>   gitweb: Add manpage for gitweb\n> \n> Or perhaps:\n> \n>   gitweb: Add manpage for gitweb configuration files\n>   gitweb: Add manpage for gitweb itself\n\nJakub,\nFor the sake of clarity I'd go with redundancy (but I've noticed that's\nnot always enormously popular around here)\n\n\tgitweb: Add manpage for gitweb configuration files--gitweb.conf(5)\n\tgitweb: Add manpage for gitweb itself--gitweb(1)\n\nPerhaps the first one is too long, but I think that it leaves little\nquestion as to what the patch contains. Otherwise, your first or final\npair of updated subjects would probably be clear enough.\n\nGranted, just as soon as you fix that somebody else will manage to top\nmy misreading of the subject line ;-).\n\n-- \n-Drew Northup\n________________________________________________\n\"As opposed to vegetable or mineral error?\"\n-John Pescatore, SANS NewsBites Vol. 12 Num. 59\n"},{"id":"177384","messageId":"7vvcrvfmg4.fsf@alter.siamese.dyndns.org","threadId":"28634","inReplyTo":"201110111739.49967.jnareb@gmail.com","subject":"Re: [PATCHv5/RFC 1/6] Documentation: Preparation for gitweb manpages","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2011-10-11T17:49:15Z","receivedAt":"2011-10-11T17:49:15Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jakub Narebski <jnareb@gmail.com> writes:\n\n> On Tue, 11 Oct 2011, Junio C Hamano wrote:\n>\n>> I probably do not have time to look into this, but just FYI my trial merge\n>> to 'pu' of this topic is failing like this:\n>> \n>> asciidoc: ERROR: gitweb.conf.txt: line 484: illegal style name: Default: ()\n>> asciidoc: ERROR: gitweb.conf.txt: line 494: illegal style name: Default: 300\n>\n> Damn, I thought I have fixed that.  This probably depends on AsciiDoc\n> version (\"make doc\" on 'master' generates a few _warnings_ for me related\n> to similar situation), but the problem is with\n>\n>   [Default: <value>]\n>\n> that was copied from gitweb/README.  But [<sth>] is an attribute list\n> (style name in simplest form), used more often in newer AsciiDoc.\n>\n> So either we have to escape '[' and ']', i.e. use {startsb} and {endsb},\n> which would reduce human-friendliness, or move to different way of marking\n> default values, e.g. _italic_.\n>\n> What do you think?\n\nWhat do the other documents in the directory this file lives say?  I think\nwe explain what the variables does, and add \"defaults to false\" or\nsomesuch in the text, without any funny mark-up.\n"},{"id":"177389","messageId":"201110112016.09620.jnareb@gmail.com","threadId":"28634","inReplyTo":"7vvcrvfmg4.fsf@alter.siamese.dyndns.org","subject":"Re: [PATCHv5/RFC 1/6] Documentation: Preparation for gitweb manpages","fromName":"Jakub Narebski","fromEmail":"jnareb@gmail.com","sentAt":"2011-10-11T18:16:09Z","receivedAt":"2011-10-11T18:16:09Z","isPatch":false,"sender":{"key":"jnareb@gmail.com","avatar":"https://avatars.githubusercontent.com/u/2706?v=4"},"body":"Junio C Hamano wrote:\n> Jakub Narebski <jnareb@gmail.com> writes:\n>> On Tue, 11 Oct 2011, Junio C Hamano wrote:\n>>\n>>> I probably do not have time to look into this, but just FYI my trial merge\n>>> to 'pu' of this topic is failing like this:\n>>> \n>>> asciidoc: ERROR: gitweb.conf.txt: line 484: illegal style name: Default: ()\n>>> asciidoc: ERROR: gitweb.conf.txt: line 494: illegal style name: Default: 300\n>>\n>> Damn, I thought I have fixed that.  This probably depends on AsciiDoc\n>> version (\"make doc\" on 'master' generates a few _warnings_ for me related\n>> to similar situation), but the problem is with\n>>\n>>   [Default: <value>]\n>>\n>> that was copied from gitweb/README.  But [<sth>] is an attribute list\n>> (style name in simplest form), used more often in newer AsciiDoc.\n>>\n>> So either we have to escape '[' and ']', i.e. use {startsb} and {endsb},\n>> which would reduce human-friendliness, or move to different way of marking\n>> default values, e.g. _italic_.\n>>\n>> What do you think?\n> \n> What do the other documents in the directory this file lives say?  I think\n> we explain what the variables does, and add \"defaults to false\" or\n> somesuch in the text, without any funny mark-up.\n\nO.K., will do.\n\nNow that reminds me that in a few situations gitweb.conf.txt uses literary\ndescription \"defaults to sth\"...  I'll make the rest consistent with this.\n\n-- \nJakub Narebski\nPoland\n"}]}