Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CompSci: Fix code blocks, Markdown formatting, and prose #837

Merged
merged 13 commits into from
Jun 12, 2018

Conversation

noahbrenner
Copy link
Contributor

These changes fit into 3 main categories, detailed below.

Code blocks

Formatting / Markdown rendering

  • The original author's intended formatting of bold inside an italic section was not processed as expected. a café at *249 Oak **#1*** turned into:
    oak
    I addressed this by making separate italic and bold italic sections which should now be rendered as:
    a café at <em>249 Oak</em> <em><strong>#1</strong></em> (imperfect, but gets the job done).
  • One revision question (_Packet loss_ is measured) was being parsed as if it were a list item, for some reason, and was thus listed as a potential answer (the "correct" answer, in fact):
    packet-loss
    I changed this question to an <h4> so that it will no longer be interpreted as a list item.
  • Two sections that were intended to be ordered lists were not rendered as such, instead being combined into a single paragraph:
    request
    I added a blank line between the lists and their preceding paragraphs so that they should be rendered as <ol>s now.
  • Add some backticks around quiz answers.

Prose

  • Fix some capitalization
  • Delete incorrect spaces, add missing spaces
  • Adjust some wording to improve grammar and clarify material

* `protocol` does not include `:`
* `host` does not include `/` after `protocol` or before `path`
* `path` includes initial `/` after `host`
Use the same name and array size as the examples from other languages
In example code blocks, use functions named `f()` and `g()`, consistent
with the rest of the description, instead of `F()` and `f()`.
Enki's markdown implementation formatted a line differently than the
original author intended. This patch is a workaround which does not
create the intended HTML structure, but does create the intended
formatting visually.

Intended output: <em>249 Oak <strong>enkidevs#1</strong></em>

Old rendering:   *249 Oak <strong>enkidevs#1*</strong>

New rendering:   <em>249 Oak</em> <em><strong>enkidevs#1</strong></em>
(or `<strong>` may be on the outside, but the concept is the same)
Somehow, the Markdown parser is rendering this question as if it were a
list item, and thus as the correct answer to the revision question,
instead of as the question itself.  Hopefully, changing this line to an
`<h4>` will prevent the misinterpretation. This will clarify the
question for the user and cause the grader to see the *intended* answer
as the correct one.
Two ordered lists (in theory) were being rendered by the markdown parser
as a single paragraph, all the items running together. Now, by adding a
blank line between each list and the preceding paragraph, they should be
rendered as real ordered lists and be easier to read.
@enki-hq
Copy link
Collaborator

enki-hq commented Jun 11, 2018

Insight previews:

Copy link
Collaborator

@lizTheDeveloper lizTheDeveloper left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These updates are so appreciated, thanks for fixing those broken questions! Also the networking intros are so much clearer now.
There's one formatting thing that has to be fixed, which I noted in the review. If you don't have time I'll probably pull these over on Friday and just fix it, otherwise I'll merge once that one thing is fixed.

💯 ✨ 🙌

@@ -47,7 +47,7 @@ The causes of packet loss vary, yet the most common ones are:
---
## Revision

_Packet loss_ is measured
#### *Packet loss* is measured
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Our format needs a third-level header here to specify the "headline", or it will throw an error / not have a headline

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Absolutely, I'll get that taken care of! I look forward to continuing to contribute!

@ghost ghost assigned lizTheDeveloper Jun 11, 2018
@ghost ghost added the review label Jun 11, 2018
@lizTheDeveloper lizTheDeveloper merged commit 32a7b32 into enkidevs:master Jun 12, 2018
@ghost ghost removed the review label Jun 12, 2018
@lizTheDeveloper
Copy link
Collaborator

🎆 You're the best! Thanks!

@noahbrenner noahbrenner deleted the comp-sci branch July 2, 2018 05:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants