From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 14 Jan 2019 23:29:33 +0000 (-0800)
Subject: Merge branch 'do/gitweb-strict-export-conf-doc'
X-Git-Tag: v2.21.0-rc0~105
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/3dc50ccf7d5224b5f44108a07aa63e297f370e72?ds=inline;hp=-c

Merge branch 'do/gitweb-strict-export-conf-doc'

Doc update.

* do/gitweb-strict-export-conf-doc:
docs: fix $strict_export text in gitweb.conf.txt
---

3dc50ccf7d5224b5f44108a07aa63e297f370e72
diff --combined Documentation/gitweb.conf.txt
index 40c9563ef6,83b4388c2c..92535dbac5
--- a/Documentation/gitweb.conf.txt
+++ b/Documentation/gitweb.conf.txt
@@@ -207,8 -207,8 +207,8 @@@ subsection on linkgit:gitweb[1] manpage
  
  $strict_export::
  	Only allow viewing of repositories also shown on the overview page.
- 	This for example makes `$gitweb_export_ok` file decide if repository is
- 	available and not only if it is shown.  If `$gitweb_list` points to
+ 	This for example makes `$export_ok` file decide if repository is
+ 	available and not only if it is shown.  If `$projects_list` points to
  	file with list of project, only those repositories listed would be
  	available for gitweb.  Can be set during building gitweb via
  	`GITWEB_STRICT_EXPORT`.  By default this variable is not set, which
@@@ -684,7 -684,7 +684,7 @@@ compressed tar archive) and "zip"; plea
  a definitive list.  By default only "tgz" is offered.
  +
  This feature can be configured on a per-repository basis via
 -repository's `gitweb.blame` configuration variable, which contains
 +repository's `gitweb.snapshot` configuration variable, which contains
  a comma separated list of formats or "none" to disable snapshots.
  Unknown values are ignored.