# HG changeset patch
# User Giampaolo Fadel <gp.fa...@gmail.com>
# Date 1248264911 -7200
# Node ID b5dca251402dc1068c80440380e243d2758f1783
# Parent 20cfcee35c2b945a20a8c24df77dde9aad5705da
doc: replace emphasis with the right role :kbd: and :guilabel: and others
diff --git a/doc/source/serve.txt b/doc/source/serve.txt
--- a/doc/source/serve.txt
+++ b/doc/source/serve.txt
@@ -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.
diff --git a/doc/source/synchronize.txt b/doc/source/synchronize.txt
--- a/doc/source/synchronize.txt
+++ b/doc/source/synchronize.txt
@@ -16,29 +16,29 @@
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
@@ -46,7 +46,7 @@
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.
@@ -58,18 +58,18 @@
.. _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)
@@ -79,9 +79,9 @@
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.
@@ -92,20 +92,20 @@
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.
------------------------------------------------------------------------------
_______________________________________________
Tortoisehg-develop mailing list
Tortoisehg-develop@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tortoisehg-develop
