[PATCH] doc/hgrc.5.txt: mention hgrc categories with higher precedence first

Adrian Buehlmann adrian at cadifra.com
Wed Oct 21 06:43:40 CDT 2009


# HG changeset patch
# User Adrian Buehlmann <adrian at cadifra.com>
# Date 1256125255 -7200
# Node ID 9ad2fe07f51fa920db5dd548ee9f3e495d51d0ae
# Parent  585d2ffe969bc5b8882d19e92130184edd27071f
doc/hgrc.5.txt: mention hgrc categories with higher precedence first

Reordering the FILES section accordingly.

The previous ordering of categories might have been nice from the
viewpoint of a site admin doing an initial install, but presenting a
higher-precedence-first ordering is more relevant and natural for the
average end user, since he will most likely resort to editing rc files
in the order of their precedence, overriding whatever "sane" defaults
are coming from more general files.

Note that this patch does not change the texts, it just moves them.
So, whatever bugs, grammar errors, or typos may have been in the texts
before this patch: they are still there. On purpose. Because this patch
here does not want to reword texts while moving them.

diff --git a/doc/hgrc.5.txt b/doc/hgrc.5.txt
--- a/doc/hgrc.5.txt
+++ b/doc/hgrc.5.txt
@@ -32,6 +32,36 @@ alphabetical order, later ones overridin
 paths are given below, settings from later paths override earlier
 ones.
 
+| (Unix, Windows) ``<repo>/.hg/hgrc``
+
+    Per-repository configuration options that only apply in a
+    particular repository. This file is not version-controlled, and
+    will not get transferred during a "clone" operation. Options in
+    this file override options in all other configuration files. On
+    Unix, most of this file will be ignored if it doesn't belong to a
+    trusted user or to a trusted group. See the documentation for the
+    trusted section below for more details.
+
+| (Unix) ``$HOME/.hgrc``
+| (Windows) ``%HOME%\Mercurial.ini``
+| (Windows) ``%HOME%\.hgrc``
+| (Windows) ``%USERPROFILE%\Mercurial.ini``
+| (Windows) ``%USERPROFILE%\.hgrc``
+
+    Per-user configuration file(s), for the user running Mercurial. 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.
+
+| (Unix) ``/etc/mercurial/hgrc.d/*.rc``
+| (Unix) ``/etc/mercurial/hgrc``
+
+    Per-system configuration files, for the system on which Mercurial
+    is running. Options in these files apply to all Mercurial commands
+    executed by any user in any directory. Options in these files
+    override per-installation options.
+
 | (Unix) ``<install-root>/etc/mercurial/hgrc.d/*.rc``
 | (Unix) ``<install-root>/etc/mercurial/hgrc``
 
@@ -42,14 +72,6 @@ ones.
     in ``/shared/tools/etc/mercurial/hgrc``. Options in these files apply
     to all Mercurial commands executed by any user in any directory.
 
-| (Unix) ``/etc/mercurial/hgrc.d/*.rc``
-| (Unix) ``/etc/mercurial/hgrc``
-
-    Per-system configuration files, for the system on which Mercurial
-    is running. Options in these files apply to all Mercurial commands
-    executed by any user in any directory. Options in these files
-    override per-installation options.
-
 | (Windows) ``<install-dir>\Mercurial.ini`` or else
 | (Windows) ``HKEY_LOCAL_MACHINE\SOFTWARE\Mercurial`` or else
 | (Windows) ``C:\Mercurial\Mercurial.ini``
@@ -61,28 +83,6 @@ ones.
     a ``Mercurial.ini`` file or be a directory where ``*.rc`` files will
     be read.
 
-| (Unix) ``$HOME/.hgrc``
-| (Windows) ``%HOME%\Mercurial.ini``
-| (Windows) ``%HOME%\.hgrc``
-| (Windows) ``%USERPROFILE%\Mercurial.ini``
-| (Windows) ``%USERPROFILE%\.hgrc``
-
-    Per-user configuration file(s), for the user running Mercurial. 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-installation and
-    per-system options.
-
-| (Unix, Windows) ``<repo>/.hg/hgrc``
-
-    Per-repository configuration options that only apply in a
-    particular repository. This file is not version-controlled, and
-    will not get transferred during a "clone" operation. Options in
-    this file override options in all other configuration files. On
-    Unix, most of this file will be ignored if it doesn't belong to a
-    trusted user or to a trusted group. See the documentation for the
-    trusted section below for more details.
-
 SYNTAX
 ------
 


More information about the Mercurial-devel mailing list