Skip to content

Commit 01e7c75

Browse files
committed
Update 2.0_use_and_contribute_to_teampsd_manual.md
Added further information about Spell Checker, Link Checker, merging a pull request, and deleting a feature branch.
1 parent 614afbb commit 01e7c75

File tree

1 file changed

+62
-4
lines changed

1 file changed

+62
-4
lines changed

2.0_use_and_contribute_to_teampsd_manual.md

Lines changed: 62 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -173,11 +173,45 @@ There are several editor actions that will screen your documents for proper form
173173

174174
- The **Spell Checker** checks for spelling errors or unknown acronyms in your commit and its associated files. This check usually passes with no errors. If the spell checker throws an error, you may need to either 1) correct a spelling mistake in your document or 2) add it to Team PSD's custom dictionary file the Spell Checker uses.
175175

176-
> Screenshot w/callouts to be developed.
176+
Click the caret next to Spell Checker to reveal the spelling errors found. In the image below, lines 14-18 identify unkown words and/or spelling mistakes.
177177

178-
- The **Markdown Link Checker** will test all the links in your document to make sure they work. **It is normal for this checker to throw errors for links within the VA domain. These can be ignored.**
178+
<img alt="Image of Spell Checker results." src="https://raw.githubusercontent.com/lzim/teampsd/gh-pages/images/spell_checker_results.png">
179179

180-
> Screenshot w/callouts to be developed.
180+
##### Correct a Misspelling in a Markdown File
181+
182+
From the example above, there is one misspelling: chapterr. The Spell Checkers gives the line number in which spelling errors were found.
183+
184+
<img alt="Image of ActionChecker line showing misspelling." src="https://raw.githubusercontent.com/lzim/teampsd/gh-pages/images/spell_checker_misspelling.png">
185+
186+
We can tell that this spelling mistake is in line #190 of the document "2.0_use_and_contribute_to_teampsd_manual.md".
187+
188+
<img alt="Image of ActionChecker line showing misspelling." src="https://raw.githubusercontent.com/lzim/teampsd/gh-pages/images/spell_checker_misspelling_markdown.png">
189+
190+
Go to the identified markdown file, correct the mistake, and make a commit.
191+
192+
##### Update cspellcdict.txt
193+
194+
From the example above, there are two unknown words: "callouts" and "GH". We can amend the custom dictionary file so these errors won't show again.
195+
196+
To do this, navigate to the repo you're working within (in this example, it's the teampsd repo), select the gh-pages branch (not the feature branch you've been working in), and click the .github/workflows folder. Then click on cspellcdict.txt (Team PSD's custom dictionary).
197+
198+
<img alt="Image showing navigation steps to reach custom dictionary." src="https://raw.githubusercontent.com/lzim/teampsd/gh-pages/images/spell_checker_nav2cspellcdict.png">
199+
200+
Edit this file by adding the previously unknown word(s)/acronyms to the list. Bonus points if you add them in the correct alphabetical order! As seen in the screenshot below, both unknown words were added. Your future self (and teammates) may appreciate singular and/or plural versions of a word being added to this file, too. Commit your changes when done.
201+
202+
<img alt="Image of cspellcdict file showing added words." src="https://raw.githubusercontent.com/lzim/teampsd/gh-pages/images/spell_checker_cspellcdict_add.png">
203+
204+
- The **Markdown Link Checker** tests all the links in your document to make sure they work correctly. Links include hyperlinks to internal and external (to VA domain) webpages, links to image files, and links to content within the document itself.
205+
206+
Click the caret next to Markdown Link Checker to reveal the status of all links within your committed files. Scroll past the colored text until you see a checkmark (working link) or an X (non-working link) within brackets beside each link.
207+
208+
Examples of the different types of links are shown below:
209+
210+
<img alt="Image of Markdown Link Checker links with callouts defining each type of link." src="https://raw.githubusercontent.com/lzim/teampsd/gh-pages/images/link_checker_link_types.png">
211+
212+
***It is normal for this checker to throw errors for links within the VA domain. These can safely be ignored.**
213+
214+
Make any link corrections needed within the document(s) and commit your changes.
181215

182216
- The **Markdown Linter for Directory Level Scan** tests your markdown file for compliance with markdown editorial rules. For example, it checks for additional spaces after each line, proper sequence of headers, bulleted lists, and other basic editorial screenings.
183217

@@ -187,4 +221,28 @@ Once edits based on failed checks and feedback from reviewers have been implemen
187221

188222
### Publish to the Master gh-pages Branch
189223

190-
Merge the feature branch into the gh-pages head branch and double-check that your chapterr was published at https://mtl.how/teampsd_manual.
224+
Once you've reviewed ActionChecker details and addressed errors, you can request teammates review your request. You can also merge the pull request yourself.
225+
226+
To merge the pull request, return to the Pull requests tab and click the Merge pull request button:
227+
228+
<img alt="Image of in-process pull request with merge pull request button highlighted." src="https://raw.githubusercontent.com/lzim/teampsd/gh-pages/images/merge_pull_request.png">
229+
230+
Then click the Confirm merge button:
231+
232+
<img alt="Image of in-process pull request with confirm merge button highlighted." src="https://raw.githubusercontent.com/lzim/teampsd/gh-pages/images/confirm_merge_pull_request.png">
233+
234+
Follow the progress of your merge by clicking the Actions tab. Be patient; it can take a few minutes for the workflows to complete. An example of the status change is provided below:
235+
236+
<img alt="Image of workflow status icons in both pending and complete states." src="https://raw.githubusercontent.com/lzim/teampsd/gh-pages/images/merge_complete.png">
237+
238+
Once you see a green status next to "pages build and deployment", double-check that your chapter was published at https://mtl.how/teampsd_manual. Once you see your changes live in the manual, you can delete the feature branch. This can be done in two ways:
239+
240+
- Click the Delete branch button on the pull request:
241+
242+
<img alt="Image of button to delete the feature branch from a pull request." src="https://raw.githubusercontent.com/lzim/teampsd/gh-pages/images/feature_branch_delete1.png">
243+
244+
--OR--
245+
246+
- Navigate to the teampsd repo, click the master branch dropdown, and select View all branches. Locate your feature branch and click the trash can icon on the right-hand side of the screen:
247+
248+
<img alt="Image with highlights showing clicks needed to delete feature branch from Branches page." src="https://raw.githubusercontent.com/lzim/teampsd/gh-pages/images/feature_branch_delete2.png">

0 commit comments

Comments
 (0)