Patchwork help: move Windows 9x information to appropriate place

login
register
mail settings
Submitter Danek Duvall
Date Jan. 15, 2016, 9:03 p.m.
Message ID <a688187cf0afd0f5495d.1452891818@smelly.us.oracle.com>
Download mbox | patch
Permalink /patch/12789/
State Accepted
Headers show

Comments

Danek Duvall - Jan. 15, 2016, 9:03 p.m.
# HG changeset patch
# User Danek Duvall <danek.duvall@oracle.com>
# Date 1452891697 28800
#      Fri Jan 15 13:01:37 2016 -0800
# Node ID a688187cf0afd0f5495db62f3e2d3097a7548e69
# Parent  0029c2bebc23182c34f83fa22abde1d5d4aebc51
help: move Windows 9x information to appropriate place
Yuya Nishihara - Jan. 17, 2016, 2:38 p.m.
On Fri, 15 Jan 2016 13:03:38 -0800, danek.duvall@oracle.com wrote:
> # HG changeset patch
> # User Danek Duvall <danek.duvall@oracle.com>
> # Date 1452891697 28800
> #      Fri Jan 15 13:01:37 2016 -0800
> # Node ID a688187cf0afd0f5495db62f3e2d3097a7548e69
> # Parent  0029c2bebc23182c34f83fa22abde1d5d4aebc51
> help: move Windows 9x information to appropriate place

Looks good to me. I would queue if I were sure.
timeless - Jan. 17, 2016, 10:11 p.m.
On Fri, Jan 15, 2016 at 4:03 PM,  <danek.duvall@oracle.com> wrote:
> # HG changeset patch
> # User Danek Duvall <danek.duvall@oracle.com>
> # Date 1452891697 28800
> #      Fri Jan 15 13:01:37 2016 -0800
> # Node ID a688187cf0afd0f5495db62f3e2d3097a7548e69
> # Parent  0029c2bebc23182c34f83fa22abde1d5d4aebc51
> help: move Windows 9x information to appropriate place
>
> diff --git a/mercurial/help/config.txt b/mercurial/help/config.txt
> --- a/mercurial/help/config.txt
> +++ b/mercurial/help/config.txt
> @@ -81,6 +81,10 @@ ones.
>     The registry key ``HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Mercurial``
>     is used when running 32-bit Python on 64-bit Windows.
>
> +.. container:: windows
> +
> +  On Windows 9x, ``%HOME%`` is replaced by ``%APPDATA%``.
> +

I think we should put this before the HKLM stuff in a verbose.windows
section (for one, HOME is mentioned before HKLM). The only time %HOME%
is mentioned is in the preceding verbose.windows section, so we should
use the same guard.

And actually, I'm not sure an additional guard is needed as long as we
don't un-indent, I think the right thing should happen.

this part is fine:
> @@ -104,14 +108,10 @@ this file override options in all other
Matt Mackall - Jan. 18, 2016, 1:34 a.m.
On Fri, 2016-01-15 at 13:03 -0800, danek.duvall@oracle.com wrote:
> # HG changeset patch
> # User Danek Duvall <danek.duvall@oracle.com>
> # Date 1452891697 28800
> #      Fri Jan 15 13:01:37 2016 -0800
> # Node ID a688187cf0afd0f5495db62f3e2d3097a7548e69
> # Parent  0029c2bebc23182c34f83fa22abde1d5d4aebc51
> help: move Windows 9x information to appropriate place

Queued for default, thanks.

-- 
Mathematics is the supreme nostalgia of our time.

Patch

diff --git a/mercurial/help/config.txt b/mercurial/help/config.txt
--- a/mercurial/help/config.txt
+++ b/mercurial/help/config.txt
@@ -81,6 +81,10 @@  ones.
    The registry key ``HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Mercurial``
    is used when running 32-bit Python on 64-bit Windows.
 
+.. container:: windows
+
+  On Windows 9x, ``%HOME%`` is replaced by ``%APPDATA%``.
+
 .. container:: verbose.plan9
 
   On Plan9, the following files are consulted:
@@ -104,14 +108,10 @@  this file override options in all other 
   belong to a trusted user or to a trusted group. See
   :hg:`help config.trusted` for more details.
 
-Per-user configuration file(s) are for the user running Mercurial.
-
-.. container:: windows
-
-  On Windows 9x, ``%HOME%`` is replaced by ``%APPDATA%``. Options in
-  these files apply to all Mercurial commands executed by this user in
-  any directory. Options in these files override per-system and
-  per-installation options.
+Per-user configuration file(s) are for the user running Mercurial.  Options
+in these files apply to all Mercurial commands executed by this user in any
+directory. Options in these files override per-system and per-installation
+options.
 
 Per-installation configuration files are searched for in the
 directory where Mercurial is installed. ``<install-root>`` is the