diff --git a/doc/hgrc.5.txt b/doc/hgrc.5.txt --- a/doc/hgrc.5.txt +++ b/doc/hgrc.5.txt @@ -29,50 +29,9 @@ Mercurial reads configuration data from 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) ``/etc/mercurial/hgrc.d/*.rc`` -| (Unix) ``/etc/mercurial/hgrc`` - - Per-installation configuration files, searched for in the - directory where Mercurial is installed. ```` 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) ``\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) ``/.hg/hgrc`` Per-repository configuration options that only apply in a @@ -83,6 +42,47 @@ ones. 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) ``/etc/mercurial/hgrc`` +| (Unix) ``/etc/mercurial/hgrc.d/*.rc`` + + Per-installation configuration files, searched for in the + directory where Mercurial is installed. ```` 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) ``\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 ------