Mercurial > hg-stable
changeset 9659:f53c549237ca
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.
| author | Adrian Buehlmann <adrian@cadifra.com> |
|---|---|
| date | Wed, 21 Oct 2009 13:40:55 +0200 |
| parents | 852b1f3032d2 |
| children | e0eae93e6c67 |
| files | doc/hgrc.5.txt |
| diffstat | 1 files changed, 42 insertions(+), 42 deletions(-) [+] |
line wrap: on
line diff
--- a/doc/hgrc.5.txt Wed Oct 28 21:35:57 2009 +0100 +++ b/doc/hgrc.5.txt Wed Oct 21 13:40:55 2009 +0200 @@ -29,50 +29,9 @@ The names of these files depend on the system on which Mercurial is installed. ``*.rc`` files from a single directory are read in alphabetical order, later ones overriding earlier ones. Where multiple -paths are given below, settings from later paths override earlier +paths are given below, settings from earlier paths override later ones. -| (Unix) ``<install-root>/etc/mercurial/hgrc.d/*.rc`` -| (Unix) ``<install-root>/etc/mercurial/hgrc`` - - Per-installation configuration files, searched for in the - directory where Mercurial is installed. ``<install-root>`` is the - parent directory of the **hg** executable (or symlink) being run. For - example, if installed in ``/shared/tools/bin/hg``, Mercurial will look - 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`` - - Per-installation/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. Registry - keys contain PATH-like strings, every part of which must reference - 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 @@ -83,6 +42,47 @@ trusted user or to a trusted group. See the documentation for the trusted section below for more details. +| (Unix) ``$HOME/.hgrc`` +| (Windows) ``%USERPROFILE%\.hgrc`` +| (Windows) ``%USERPROFILE%\Mercurial.ini`` +| (Windows) ``%HOME%\.hgrc`` +| (Windows) ``%HOME%\Mercurial.ini`` + + 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`` +| (Unix) ``/etc/mercurial/hgrc.d/*.rc`` + + 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`` +| (Unix) ``<install-root>/etc/mercurial/hgrc.d/*.rc`` + + Per-installation configuration files, searched for in the + directory where Mercurial is installed. ``<install-root>`` is the + parent directory of the **hg** executable (or symlink) being run. For + example, if installed in ``/shared/tools/bin/hg``, Mercurial will look + in ``/shared/tools/etc/mercurial/hgrc``. Options in these files apply + to all Mercurial commands executed by any user in any directory. + +| (Windows) ``C:\Mercurial\Mercurial.ini`` +| (Windows) ``HKEY_LOCAL_MACHINE\SOFTWARE\Mercurial`` +| (Windows) ``<install-dir>\Mercurial.ini`` + + Per-installation/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. Registry + keys contain PATH-like strings, every part of which must reference + a ``Mercurial.ini`` file or be a directory where ``*.rc`` files will + be read. + SYNTAX ------