summaryrefslogtreecommitdiffstats
path: root/documentation/overview-manual/development-environment.rst
diff options
context:
space:
mode:
authorMichael Opdenacker <michael.opdenacker@bootlin.com>2022-03-28 17:37:44 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-03-31 11:46:03 +0100
commit325c23cd0f80456111ce886af141501a8a74282c (patch)
tree31096b4dead9592103a6add952c8f57b372e8285 /documentation/overview-manual/development-environment.rst
parentecab5f36555d50ac35eaafd3b56a9a67086be77e (diff)
downloadpoky-325c23cd0f80456111ce886af141501a8a74282c.tar.gz
manuals: fix quoting of double dashes
Otherwise rendered as "en" dashes by sphinx, for example: git pull –rebase instead of git pull --rebase Readers could confuse them with normal dashes. Exception: replace by \-\- in italic text (*text*) as Sphinx cannot nest italic and quoted text. For consistency, also update quoting in strings in the same code hunks. (From yocto-docs rev: 4e7ce372e37f76148f623a5295a15e08bc2603ff) Signed-off-by: Michael Opdenacker <michael.opdenacker@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'documentation/overview-manual/development-environment.rst')
-rw-r--r--documentation/overview-manual/development-environment.rst4
1 files changed, 2 insertions, 2 deletions
diff --git a/documentation/overview-manual/development-environment.rst b/documentation/overview-manual/development-environment.rst
index 8ffa8c7e3e..19095fc116 100644
--- a/documentation/overview-manual/development-environment.rst
+++ b/documentation/overview-manual/development-environment.rst
@@ -550,11 +550,11 @@ descriptions and strategies on how to use these commands:
550 You need to be in a local branch other than the one you are deleting 550 You need to be in a local branch other than the one you are deleting
551 in order to delete branch-name. 551 in order to delete branch-name.
552 552
553- *git pull --rebase:* Retrieves information from an upstream Git 553- *git pull \-\-rebase*: Retrieves information from an upstream Git
554 repository and places it in your local Git repository. You use this 554 repository and places it in your local Git repository. You use this
555 command to make sure you are synchronized with the repository from 555 command to make sure you are synchronized with the repository from
556 which you are basing changes (e.g. the "&DISTRO_NAME_NO_CAP;" 556 which you are basing changes (e.g. the "&DISTRO_NAME_NO_CAP;"
557 branch). The "--rebase" option ensures that any local commits you 557 branch). The ``--rebase`` option ensures that any local commits you
558 have in your branch are preserved at the top of your local branch. 558 have in your branch are preserved at the top of your local branch.
559 559
560- *git push repo-name local-branch:upstream-branch:* Sends 560- *git push repo-name local-branch:upstream-branch:* Sends