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

doc: replace emphasis with the right role :kbd: and :guilabel: and others

Changeset 2163d6fd6d92…

Parent b12fea3af802…

by Giampaolo Fadel

Changes to 2 files · Browse files at 2163d6fd6d92 Showing diff from parent b12fea3af802 Diff from another changeset...

Change 1 of 2 Show Entire File doc/​source/​serve.txt Stacked
 
13
14
15
16
 
17
18
19
 
20
21
22
 
23
24
25
 
26
27
28
 
29
30
31
32
33
34
 
35
36
37
 
42
43
44
45
 
46
47
48
 
13
14
15
 
16
17
18
 
19
20
21
 
22
23
24
 
25
26
27
 
28
29
30
31
32
33
 
34
35
36
37
 
42
43
44
 
45
46
47
48
@@ -13,25 +13,25 @@
 .. figure:: figures/serve.png   :alt: Web server dialog   -*Start* +:guilabel:`Start`   start the web server   -*Stop* +:guilabel:`Stop`   stop the web server   -*Browse* +:guilabel:`Browse`   open your default browser at the built-in web server   -*Configure* +:guilabel:`Configure`   Configure repository web style, description, and access policies   -When the settings dialog is launched via the *Configure* button, it is +When the settings dialog is launched via the :guilabel:`Configure` button, it is  run in the context of the current repository. Please visit the  Mercurial wiki for detailed descriptions of what the various web  configurations are for.    If you wish to serve a many repositories with a single web server -instance, you can create an ``hgwebdir.conf`` text file with the +instance, you can create an :file:`hgwebdir.conf` text file with the  following contents: ::     [paths] @@ -42,7 +42,7 @@
 can be found on your computer. Multiple entries are possible.    To use this file you must launch the TortoiseHg serve dialog from the -command line via: ``hgtk serve --webdir-conf=hgwebdir.conf``. In a +command line via: :command:`hgtk serve --webdir-conf=hgwebdir.conf`. In a  future release of TortoiseHg, we hope to make this launchable from the  shell context menu.  
Change 1 of 5 Show Changes Only doc/​source/​synchronize.txt Stacked
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
 
20
21
 
22
23
 
24
25
 
26
27
 
28
29
 
30
31
 
32
33
34
35
36
 
 
 
37
38
 
39
40
41
 
 
42
43
44
45
46
47
48
49
 
50
51
52
53
54
55
56
57
58
59
60
61
 
62
63
64
 
65
66
 
67
68
 
69
70
 
71
72
 
73
74
75
76
77
78
79
80
81
82
 
83
84
 
85
86
87
88
89
90
91
92
93
94
95
 
96
97
98
99
 
 
100
101
102
103
104
105
106
 
107
108
 
109
110
111
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
 
19
20
 
21
22
 
23
24
 
25
26
 
27
28
 
29
30
 
31
32
33
 
 
 
34
35
36
37
 
38
39
 
 
40
41
42
43
44
45
46
47
48
 
49
50
51
52
53
54
55
56
57
58
59
60
 
61
62
63
 
64
65
 
66
67
 
68
69
 
70
71
 
72
73
74
75
76
77
78
79
80
81
 
82
83
 
84
85
86
87
88
89
90
91
92
93
94
 
95
96
97
 
 
98
99
100
101
102
103
104
105
 
106
107
 
108
109
110
111
 ======================  TortoiseHg Synchronize  ======================    .. module:: synchronize.dialog   :synopsis: Dialog used to perform synchronization operations    This page describes the 0.7 version of synchronize    The synchronize tool is used to transmit changesets between repositories  and to email recipients.      .. figure:: figures/synchronize.png   :alt: Synchronize dialog     Synchronize dialog   -*Incoming* +:guilabel:`Incoming`   show changesets that would be pulled from target repository -*Pull* +:guilabel:`Pull`   pull incoming changesets from target repository [1] -*Outgoing* +:guilabel:`Outgoing`   show changesets that would be pushed to target repository -*Push* +:guilabel:`Push`   push outgoing changesets to target repository -*Email* +:guilabel:`Email`   send outgoing changesets (to target repository) as email -*Stop* +:guilabel:`Stop`   stop current operation -*Configure* +:guilabel:`Configure`   Configure repository paths (aliases)   -1) The *Pull* toolbutton has a drop-down menu with extra options that -are only applicable to pull operations: *Update after Pull*, and *Use -fetch*. See the fetch extension documentation for it's behavior. +1) The :guilabel:`Pull` toolbutton has a drop-down menu with extra options that + are only applicable to pull operations: :guilabel:`Update after Pull`, and + :guilabel:`Use fetch`. See the fetch extension documentation for it's behavior.   -The *Repo:* button will open a directory finder to locate another +The :guilabel:`Repo:` button will open a directory finder to locate another  repository on your local computer to synchronize with. Similarly, the -*Bundle* button will open a file finder to locate a Mercurial bundle -(``.hg``) file to pull changes from. +:guilabel:`Bundle` button will open a file finder to locate a Mercurial bundle +(:command:`.hg`) file to pull changes from.    The text entry/combo box is where you enter or select paths of target  repositories. The synchronize tool will seed the drop-down list with  path aliases configured for this repository, and with the most 10 recent  paths used with any repository. There will be a dashed separator between  the configured paths and the history.   -The *use proxy* button is a quick way to disable your proxy +The :guilabel:`use proxy` button is a quick way to disable your proxy  configuration for just a few operations. The button is only sensitive  when you have an http proxy configured.    All operations which require authentication will pop up dialog boxes to  get the required information from the user. TortoiseHg uses the  TortoisePlink tool (borrowed from the TortoiseSVN distribution) to  handle *ssh:* connections and authentication. See the FAQ1_ for help if  you have trouble connecting to ssh servers.    .. _FAQ1: http://bitbucket.org/tortoisehg/stable/wiki/FAQ#tortoisehg-faq   -Under the *Advanced Options* fold-up panel are a number of configurables +Under the :guilabel:`Advanced Options` fold-up panel are a number of configurables  that are valid for most push/pull operations.   -*Specify target revision for transmission* +:guilabel:`Specify target revision for transmission`   to avoid sending all revisions -*Force pull or push* +:guilabel:`Force pull or push`   override warnings about multiple heads or unrelated repositories -*Show patches* +:guilabel:`Show patches`   show diffs in incoming and outging changes -*Show Newest First* +:guilabel:`Show Newest First`   reverse order that changesets are listed -*Show No Merges* +:guilabel:`Show No Merges`   filter out merge changesets from output (does not affect push/pull)      After Pull  ----------    After changesets are pulled into your repository, two buttons may appear  at the bottom of the dialog:   -*View pulled changesets* +:guilabel:`View pulled changesets`   Open the changelog viewer and inspect pulled changesets -*Update to tip* +:guilabel:`Update to tip`   Update your working directory to the new tip    Either button may be hidden if it is not applicable.    Email  -----    The email dialog can be launched from two TortoiseHg tools.    1) The changelog tool, in which case the user intends to email a single -revision + revision    2) The synchronize tool, in which case the user intends to email all -outgoing changes to the current target repository (it's good practice to -check the outgoing changes before launching the email dialog). + outgoing changes to the current target repository (it's good practice to + check the outgoing changes before launching the email dialog).    .. figure:: figures//email.png   :alt: Email dialog     Email dialog   -The *Send* button is obvious, and the *Configure* dialog predictably +The :guilabel:`Send:guilabel:` button is obvious, and the :guilabel:`Configure` dialog predictably  opens the TortoiseHg Settings dialog to the email tab where you can -configure your SMTP settings and set default To: and From: addresses. +configure your SMTP settings and set default :guilabel:`To:` and :guilabel:`From:` addresses.    Please consult the Mercurial documentation for the differences between  plain patches, HG patches, Git patches, and bundles.