Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.8.2, 0.8.3, and 0.9

doc: fix some tags in settings

Changeset 875dd94214a7…

Parent 5875e3e16b1b…

by Giampaolo Fadel

Changes to one file · Browse files at 875dd94214a7 Showing diff from parent 5875e3e16b1b Diff from another changeset...

Change 1 of 4 Show Entire File doc/​source/​settings.txt Stacked
 
89
90
91
92
93
 
 
94
95
96
 
177
178
179
180
181
 
 
 
182
183
184
 
251
252
253
254
 
255
256
257
 
286
287
288
289
290
291
 
 
 
292
293
294
 
89
90
91
 
 
92
93
94
95
96
 
177
178
179
 
 
180
181
182
183
184
185
 
252
253
254
 
255
256
257
258
 
287
288
289
 
 
 
290
291
292
293
294
295
@@ -89,8 +89,8 @@
  Graphical merge program for resolving merge conflicts. If left   unspecified, Mercurial will use the first applicable tool it finds   on your system or use its internal merge tool that leaves conflict - markers in place. Chose internal:merge to force conflict markers, - internal:prompt to always select local or other, or internal:dump + markers in place. Chose :guilabel:`internal:merge` to force conflict markers, + :guilabel:`internal:prompt` to always select local or other, or :guilabel:`internal:dump`   to leave files in the working directory for manual merging.    :guilabel:`Visual Diff Command:` @@ -177,8 +177,9 @@
   :guilabel:`After pull operation:`   Operation which is performed directly after a successful pull. - update equates to pull --update, fetch equates to the fetch - extension, rebase equates to pull --rebase. Default: none. + :guilabel:`update` equates to :command:`pull --update`, :guilabel:`fetch` + equates to the fetch extension, :guilabel:`rebase` equates to + :command:`pull --rebase`. Default: none.    :guilabel:`Remote repository paths`   In this pane you can configure aliases for repositories that you @@ -251,7 +252,7 @@
   :guilabel:`Host:`   Host name and (optional) port of proxy server, for - example "myproxy:8000". + example ``myproxy:8000``.    :guilabel:`Bypass List:`   Optional. Comma-separated list of host names that @@ -286,9 +287,9 @@
 :guilabel:`method:`   Optional. Method to use to send email messages. If value is "smtp" (default),   use SMTP (configured below). Otherwise, use as name of program to run that - acts like sendmail (takes "-f" option for sender, list of recipients on - command line, message on stdin). Normally, setting this to "sendmail" or - "/usr/sbin/sendmail" is enough to use sendmail to send messages. + acts like sendmail (takes :command:`-f` option for sender, list of recipients on + command line, message on stdin). Normally, setting this to ``sendmail`` or + ``/usr/sbin/sendmail`` is enough to use sendmail to send messages.    :guilabel:`SMTP Host:`   Host name of mail server.