Show More
@@ -36,7 +36,7 b' ones.' | |||
|
36 | 36 | this file override options in all other configuration files. On |
|
37 | 37 | Unix, most of this file will be ignored if it doesn't belong to a |
|
38 | 38 | trusted user or to a trusted group. See the documentation for the |
|
39 |
|
|
|
39 | ``[trusted]`` section below for more details. | |
|
40 | 40 | |
|
41 | 41 | | (Unix) ``$HOME/.hgrc`` |
|
42 | 42 | | (Windows) ``%USERPROFILE%\.hgrc`` |
@@ -228,8 +228,8 b' echo foo`` call above, ``$HG_ARGS`` woul' | |||
|
228 | 228 | |
|
229 | 229 | Authentication credentials for HTTP authentication. This section |
|
230 | 230 | allows you to store usernames and passwords for use when logging |
|
231 |
*into* HTTP servers. See the |
|
|
232 | configure *who* can login to your HTTP server. | |
|
231 | *into* HTTP servers. See the ``[web]`` configuration section if | |
|
232 | you want to configure *who* can login to your HTTP server. | |
|
233 | 233 | |
|
234 | 234 | Each line has the following format:: |
|
235 | 235 | |
@@ -404,7 +404,7 b' Settings for extensions that send email ' | |||
|
404 | 404 | |
|
405 | 405 | ``method`` |
|
406 | 406 | Optional. Method to use to send email messages. If value is ``smtp`` |
|
407 |
(default), use SMTP (see the |
|
|
407 | (default), use SMTP (see the ``[smtp]`` section for configuration). | |
|
408 | 408 | Otherwise, use as name of program to run that acts like sendmail |
|
409 | 409 | (takes ``-f`` option for sender, list of recipients on command line, |
|
410 | 410 | message on stdin). Normally, setting this to ``sendmail`` or |
@@ -1028,7 +1028,7 b' User interface controls.' | |||
|
1028 | 1028 | ``merge`` |
|
1029 | 1029 | The conflict resolution program to use during a manual merge. |
|
1030 | 1030 | For more information on merge tools see :hg:`help merge-tools`. |
|
1031 |
For configuring merge tools see the merge-tools |
|
|
1031 | For configuring merge tools see the ``[merge-tools]`` section. | |
|
1032 | 1032 | |
|
1033 | 1033 | ``portablefilenames`` |
|
1034 | 1034 | Check for portable filenames. Can be ``warn``, ``ignore`` or ``abort``. |
General Comments 0
You need to be logged in to leave comments.
Login now