diff options
author | Remy Bohmer <linux@bohmer.net> | 2012-02-19 21:21:36 +0100 |
---|---|---|
committer | Remy Bohmer <linux@bohmer.net> | 2012-02-19 21:21:36 +0100 |
commit | 203eea399516d93979fc75095d16adaebe470637 (patch) | |
tree | 36b172929c87055d2c2509016df863ebdcf86d0f | |
parent | 875425d385201b31680ef92b949279e07bf5d9c6 (diff) |
[Doc] Section changeMerge is not properly formatted, some small fixes
The Section 'changeMerge' in the Documentation is not properly formatted
and also the Section commentlink was incorrect.
Repaired the section formatting across the entire file.
Change-Id: Id3ae4cfdf31f829892a3258395ff5bf859616501
Signed-off-by: Remy Bohmer <linux@bohmer.net>
-rw-r--r-- | Documentation/config-gerrit.txt | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/Documentation/config-gerrit.txt b/Documentation/config-gerrit.txt index eded40bff0..ebe71b2327 100644 --- a/Documentation/config-gerrit.txt +++ b/Documentation/config-gerrit.txt @@ -592,9 +592,8 @@ link:cmd-flush-caches.html[gerrit flush-caches]. + Default is 5 minutes. - [[changeMerge]]Section changeMerge -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Controls whether or not the mergeability test of changes is enabled. If enabled, when the change page is loaded, the test is @@ -606,11 +605,10 @@ the result. test = true ---- -+ By default this is false (test is not enabled). [[commentlink]]Section commentlink -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Comment links are find/replace strings applied to change descriptions, patch comments, and in-line code comments to turn set strings into hyperlinks. One common use is for linking to bug-tracking systems. @@ -1136,7 +1134,7 @@ using the property 'gitweb.pathSeparator'. Valid values are the characters '*', '(' and ')'. [[hooks]]Section hooks -~~~~~~~~~~~~~~~~~~~~~~~~ +~~~~~~~~~~~~~~~~~~~~~~ See also link:config-hooks.html[Hooks]. @@ -2157,7 +2155,7 @@ Defaults to 0 seconds, wait indefinitely. [[upload]]Section upload -~~~~~~~~~~~~~~~~~~~~~~~~~~ +~~~~~~~~~~~~~~~~~~~~~~~~ Sets the group of users allowed to execute 'upload-pack' on the server, 'upload-pack' is what runs on the server during a user's fetch, clone or repo sync command. @@ -2206,7 +2204,7 @@ By default "Anonymous Coward" is used. File `etc/secure.config` -------------------------- +------------------------ The optional file `'$site_path'/etc/secure.config` overrides (or supplements) the settings supplied by `'$site_path'/etc/gerrit.config`. The file should be readable only by the daemon process and can be |