From 7f6e6a46c7f79af78ff907c6cd5d0cf18145a560 Mon Sep 17 00:00:00 2001 From: David Sangojinmi Date: Mon, 10 May 2021 14:07:33 +0100 Subject: [PATCH 1/4] Capitalised start of setting or section titles. Small formatting changes --- cs139/{Lang2.md => CSS.md} | 0 cs139/{Lang1.md => HTML.md} | 60 +++++++++++++++---------------- cs139/{Lang4.md => JavaScript.md} | 0 cs139/{Lang3.md => PHP.md} | 0 cs139/{Lang5.md => SQL.md} | 0 cs139/index.md | 10 +++--- 6 files changed, 34 insertions(+), 36 deletions(-) rename cs139/{Lang2.md => CSS.md} (100%) rename cs139/{Lang1.md => HTML.md} (92%) rename cs139/{Lang4.md => JavaScript.md} (100%) rename cs139/{Lang3.md => PHP.md} (100%) rename cs139/{Lang5.md => SQL.md} (100%) diff --git a/cs139/Lang2.md b/cs139/CSS.md similarity index 100% rename from cs139/Lang2.md rename to cs139/CSS.md diff --git a/cs139/Lang1.md b/cs139/HTML.md similarity index 92% rename from cs139/Lang1.md rename to cs139/HTML.md index ffeda5b0..e7e011dc 100644 --- a/cs139/Lang1.md +++ b/cs139/HTML.md @@ -12,18 +12,18 @@ Stands for HyperText Markup Language. HTML is a __semantic__ language it describes the structure of the document and not the content. # HTML Nesting structure -## parent +## Parent A tag is a parent of another if it immediately encloses the tag. -## child +## Child A tag is a child of another if it is immediately enclosed by the tag. -## ancestor +## Ancestor A tag is an ancestor if it is the parent or the parent of an ancestor of a tag. -## ancestor +## Descendant A tag is an descendant if it is the child or the child of a descendant of a tag. ## Sibling Two tags are siblings if they share a parent. -# Syntax +# Basic Syntax HTML uses code tags for opening and closing to give information about the content inside, opening use `<>` and closing starts with a backslash `` The tags can also contain attributes with additional information like the class or ids. @@ -36,10 +36,9 @@ Attribute | `href="www.google.com"` content | `a search engine` closing tag | `` -combined: -` a search engine ` +Example of a HTML tag: ` a search engine ` -## empty tags +## Empty tags Some tags have no content and so are empty, a closing tag is not needed. `` @@ -56,7 +55,7 @@ is correct is incorrect # Character Entities -some symbols have special characters. +Some symbols need to be represented with special characters so they are formatted correctly. Entity | Description ---|--- @@ -67,9 +66,8 @@ Entity | Description `™`| ™ -# block vs inline -Some elements are blocks these start and end with a new line. -including: +# Block vs Inline +Some elements are blocks these start and end with a new line. Examples are: * `

` * `

` * `