Patchwork [4,of,4,STABLE] help: call out specific replacement configuration settings

mail settings
Submitter Matt Harbison
Date May 4, 2017, 3:30 a.m.
Message ID <ef3df737d6758aee4a68.1493868634@Envy>
Download mbox | patch
Permalink /patch/20424/
State Accepted
Headers show


Matt Harbison - May 4, 2017, 3:30 a.m.
# HG changeset patch
# User Matt Harbison <>
# Date 1493866613 14400
#      Wed May 03 22:56:53 2017 -0400
# Branch stable
# Node ID ef3df737d6758aee4a682d97b0a68a20fbef3db4
# Parent  a915b7b37d08050b393f8ed9482270bd2c5abdf5
help: call out specific replacement configuration settings

As an aside, I'm having trouble parsing the help text meaning for HG when it is
unset or empty.  How can it be the frozen name or searched if it is empty?


diff --git a/mercurial/help/environment.txt b/mercurial/help/environment.txt
--- a/mercurial/help/environment.txt
+++ b/mercurial/help/environment.txt
@@ -8,7 +8,7 @@ 
     This is the name of the editor to run when committing. See EDITOR.
-    (deprecated, use configuration file)
+    (deprecated, see :hg:`help config.ui.editor`)
     This overrides the default locale setting detected by Mercurial.
@@ -36,7 +36,7 @@ 
     will be executed with three arguments: local file, remote file,
     ancestor file.
-    (deprecated, use configuration file)
+    (deprecated, see :hg:`help config.ui.merge`)
     A list of files or directories to search for configuration
@@ -87,7 +87,7 @@ 
     - interactive prompt
     - LOGNAME (with ``@hostname`` appended)
-    (deprecated, use configuration file)
+    (deprecated, see :hg:`help config.ui.username`)
     May be used as the author of a commit; see HGUSER.