Merge branch 'jz/gitweb-conf-doc-fix' into maint

gitster · gitster · commit 1c30f8efa4ce · 2015-04-21T12:12:22.000-07:00
Documentation update.

* jz/gitweb-conf-doc-fix:
  gitweb.conf.txt: say "build-time", not "built-time"
diff --git a/Documentation/gitweb.conf.txt b/Documentation/gitweb.conf.txt
@@ -482,7 +482,7 @@ project config.  Per-repository configuration takes precedence over value
 composed from `@git_base_url_list` elements and project name.
 +
 You can setup one single value (single entry/item in this list) at build
-time by setting the `GITWEB_BASE_URL` built-time configuration variable.
+time by setting the `GITWEB_BASE_URL` build-time configuration variable.
 By default it is set to (), i.e. an empty list.  This means that gitweb
 would not try to create project URL (to fetch) from project name.
 

Original file line number	Diff line number	Diff line change
`@@ -482,7 +482,7 @@ project config. Per-repository configuration takes precedence over value`
`482`	`482`	composed from `@git_base_url_list` elements and project name.
`483`	`483`	`+`
`484`	`484`	`You can setup one single value (single entry/item in this list) at build`
`485`		-time by setting the `GITWEB_BASE_URL` built-time configuration variable.
	`485`	+time by setting the `GITWEB_BASE_URL` build-time configuration variable.
`486`	`486`	`By default it is set to (), i.e. an empty list. This means that gitweb`
`487`	`487`	`would not try to create project URL (to fetch) from project name.`
`488`	`488`