From 85fdecd1290cd6d38a29382a9fa3babfdd52e99b Mon Sep 17 00:00:00 2001 From: ramonsalguer <javier.ramon@telefonica.com> Date: Fri, 22 Mar 2019 00:10:08 +0100 Subject: [PATCH] Minor typo fixes in Intro and VS Code extensions --- Workflow for documentation production in OSM.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Workflow for documentation production in OSM.md b/Workflow for documentation production in OSM.md index f8f18d3..b3599ed 100644 --- a/Workflow for documentation production in OSM.md +++ b/Workflow for documentation production in OSM.md @@ -17,7 +17,7 @@ In the edition process there are two roles: ## Contributor -Basic Software (available on Windows, Mac. and Linux): +Basic software (available on Windows, Mac and Linux): - [Git](https://git-scm.com/) - [Pandoc](https://pandoc.org/) @@ -51,11 +51,11 @@ Basic Software (available on Windows, Mac. and Linux): - `fcrespo82.markdown-table-formatter` - `yzane.markdown-pdf` -To install extensions in VSCode you can follow any of the procedures described in: https://code.visualstudio.com/docs/editor/extension-gallery +To install extensions in VSCode you can follow any of the procedures described in the [VS Code guide for extensions](https://code.visualstudio.com/docs/editor/extension-gallery). -This document provides the description of all the procedures based on Git as CLI command to minimize any potential ambiguity. However, it must be noted that all actions required for contributors and the most common actions of the editor can be conveniently performed from the integrated editor, following the same steps but in a more visual manner. Once you have read this document, it is highly recommended checking this [visual guide](https://code.visualstudio.com/docs/editor/versioncontrol), which shows how to perform all the operations in a visual manner. +This document provides the description of all the procedures based on Git as CLI commands to minimize any potential ambiguity. However, it must be noted that all actions required for contributors and the commonest actions for the editor can be conveniently performed from the integrated editor, following the same steps but in a visual manner. Once you have read this document, it is highly recommended checking this [visual guide](https://code.visualstudio.com/docs/editor/versioncontrol), which shows how to perform all the operations using the editor GUI. -Beware that the required steps for each of the procedures of this document will be exactly the same, and should happen in the same order, both for the integrated editor and the CLI. Furthermore, there is total interchangeability between both means, so that you can combine steps performed from the editor with steps performed from the CLI at your total discretion with no risk of confusing Git (in the end of the day, the editor also invokes the own `git` command behind the scenes). +Beware that the steps required for each of the procedures described thorough this document are exactly the same, and should happen in the same order, for both the integrated editor and the CLI. Furthermore, there is total interchangeability between both means, so that you can combine steps performed from the editor with steps performed from the CLI at your total discretion, with no risk of confusing Git (in the end of the day, the editor also invokes the own `git` command behind the scenes). ## Markdown conversion basics @@ -156,7 +156,7 @@ Note that **this procedure needs to be followed exactly as it is described** or - You are **rewriting** your Git history and, therefore, might delete wrong entries if you make any mistake. Please read these steps carefully and follow them accurately. - Any changes not committed before starting this procedure. If they are relevant for your, you should commit them (to `master`) as well. -As said, you can follow this procedure (assuming that you start in your `master` branch): +As said, you can follow this procedure (assuming that you were initially in your `master` branch): ```bash git branch newbranch # Create a new branch, saving the desired commits -- GitLab