From 1e7311f8bb9a8ca4c70edcd8f67ae22df72c97a7 Mon Sep 17 00:00:00 2001 From: Palle Cogburn <4thex@users.noreply.github.com> Date: Mon, 13 Oct 2014 06:04:11 -0700 Subject: [PATCH 1/9] Update HTML5.md --- HTML5.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/HTML5.md b/HTML5.md index 4e5a07f..67cc832 100644 --- a/HTML5.md +++ b/HTML5.md @@ -11,7 +11,7 @@ HTML5 is what makes up web pages, and since a Chrome application consists of web Let's look at XML syntax first. An XML document is a file, that contains structured information. The structure is defined by using the following characters that have special meaning in XML: -```XML +``` < > / " = & # ; ``` ###Elements From 1b0cb32d648f9f767d5047be0ce467900cd3b999 Mon Sep 17 00:00:00 2001 From: Palle Cogburn <4thex@users.noreply.github.com> Date: Tue, 14 Oct 2014 04:14:10 -0700 Subject: [PATCH 2/9] Create description.md --- course/html5/description.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 course/html5/description.md diff --git a/course/html5/description.md b/course/html5/description.md new file mode 100644 index 0000000..d26a4f6 --- /dev/null +++ b/course/html5/description.md @@ -0,0 +1 @@ +##Placeholder From 0194a93699f109ce0f4174f0a5e2d118ac91027d Mon Sep 17 00:00:00 2001 From: Palle Cogburn <4thex@users.noreply.github.com> Date: Tue, 14 Oct 2014 04:16:17 -0700 Subject: [PATCH 3/9] Update description.md --- course/html5/description.md | 55 ++++++++++++++++++++++++++++++++++++- 1 file changed, 54 insertions(+), 1 deletion(-) diff --git a/course/html5/description.md b/course/html5/description.md index d26a4f6..67cc832 100644 --- a/course/html5/description.md +++ b/course/html5/description.md @@ -1 +1,54 @@ -##Placeholder +#HTML5 + +##What is it? +HTML5 is an abbreviation that stands for Hyper Text Markup Language version 5. + +It is an extension to XML; eXtensible Markup Language. + +##Why should I care? +HTML5 is what makes up web pages, and since a Chrome application consists of web pages, we need to know how to create HTML5 content. + +Let's look at XML syntax first. + +An XML document is a file, that contains structured information. The structure is defined by using the following characters that have special meaning in XML: +``` +< > / " = & # ; +``` +###Elements +The `<` and `>` characters are used to define *elements*. + +An element can either have content, or be empty. + +An empty element must start with `<` and end with `/>`. In between is the name of the element and maybe some *attributes*, we'll get back to those. +```XML + +``` +The word `html` is the name of the element. An element in XML can have any name. + +An element with content must first have a *start-tag* that starts with `<` and ends with `>`, then comes the content, which can be text, or other elements, and then at the end comes the *end-tag*, which starts with ``. +```XML + +Some content + +``` + +An element can have any number of *child-elements*, which can again have child-elements to any level of nexting you want. +```XML + + + My first web page + + +

Here is a paragraph

+ + +``` + +It is customary to indent child-elements, but it is not neccessary. It just makes it more *pretty*, and easier to read. + +Something like this is perfectly legal XML syntax: +```XML +

Here is a paragraph

+``` + +##Where can I find more information? From 63035a18f9dcea0fb9daa21a673f9b72ddd73fad Mon Sep 17 00:00:00 2001 From: Palle Cogburn <4thex@users.noreply.github.com> Date: Tue, 14 Oct 2014 04:17:43 -0700 Subject: [PATCH 4/9] Update description.md --- course/html5/description.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/course/html5/description.md b/course/html5/description.md index 67cc832..3787f69 100644 --- a/course/html5/description.md +++ b/course/html5/description.md @@ -1,5 +1,7 @@ -#HTML5 - +--- +layout: page +title: HTML5 +--- ##What is it? HTML5 is an abbreviation that stands for Hyper Text Markup Language version 5. From 34c045c02bd4def3533abaffd9977482b02282bf Mon Sep 17 00:00:00 2001 From: Palle Cogburn <4thex@users.noreply.github.com> Date: Tue, 14 Oct 2014 04:52:35 -0700 Subject: [PATCH 5/9] Update description.md --- course/html5/description.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/course/html5/description.md b/course/html5/description.md index 3787f69..f2ec95a 100644 --- a/course/html5/description.md +++ b/course/html5/description.md @@ -13,9 +13,8 @@ HTML5 is what makes up web pages, and since a Chrome application consists of web Let's look at XML syntax first. An XML document is a file, that contains structured information. The structure is defined by using the following characters that have special meaning in XML: -``` -< > / " = & # ; -``` +`< > / " = & # ; + ###Elements The `<` and `>` characters are used to define *elements*. From e9bd775ac3f8ce1fde172e1628d06e9bb26469f8 Mon Sep 17 00:00:00 2001 From: Palle Cogburn <4thex@users.noreply.github.com> Date: Tue, 14 Oct 2014 05:09:03 -0700 Subject: [PATCH 6/9] Update description.md --- course/html5/description.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/course/html5/description.md b/course/html5/description.md index f2ec95a..e79372c 100644 --- a/course/html5/description.md +++ b/course/html5/description.md @@ -13,7 +13,7 @@ HTML5 is what makes up web pages, and since a Chrome application consists of web Let's look at XML syntax first. An XML document is a file, that contains structured information. The structure is defined by using the following characters that have special meaning in XML: -`< > / " = & # ; +`< > / " = & # ;` ###Elements The `<` and `>` characters are used to define *elements*. @@ -21,20 +21,20 @@ The `<` and `>` characters are used to define *elements*. An element can either have content, or be empty. An empty element must start with `<` and end with `/>`. In between is the name of the element and maybe some *attributes*, we'll get back to those. -```XML +``` ``` The word `html` is the name of the element. An element in XML can have any name. An element with content must first have a *start-tag* that starts with `<` and ends with `>`, then comes the content, which can be text, or other elements, and then at the end comes the *end-tag*, which starts with ``. -```XML +``` Some content ``` An element can have any number of *child-elements*, which can again have child-elements to any level of nexting you want. -```XML +``` My first web page @@ -48,7 +48,7 @@ An element can have any number of *child-elements*, which can again have child-e It is customary to indent child-elements, but it is not neccessary. It just makes it more *pretty*, and easier to read. Something like this is perfectly legal XML syntax: -```XML +```

Here is a paragraph

``` From 7fce198fd94ab5be0dafbdc7f8eaf8d5ad4c445f Mon Sep 17 00:00:00 2001 From: Palle Cogburn <4thex@users.noreply.github.com> Date: Tue, 14 Oct 2014 06:00:12 -0700 Subject: [PATCH 7/9] Update description.md --- course/html5/description.md | 41 +++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 22 deletions(-) diff --git a/course/html5/description.md b/course/html5/description.md index e79372c..3d3fa8c 100644 --- a/course/html5/description.md +++ b/course/html5/description.md @@ -13,7 +13,8 @@ HTML5 is what makes up web pages, and since a Chrome application consists of web Let's look at XML syntax first. An XML document is a file, that contains structured information. The structure is defined by using the following characters that have special meaning in XML: -`< > / " = & # ;` + + < > / " = & # ; ###Elements The `<` and `>` characters are used to define *elements*. @@ -21,35 +22,31 @@ The `<` and `>` characters are used to define *elements*. An element can either have content, or be empty. An empty element must start with `<` and end with `/>`. In between is the name of the element and maybe some *attributes*, we'll get back to those. -``` - -``` + + + The word `html` is the name of the element. An element in XML can have any name. An element with content must first have a *start-tag* that starts with `<` and ends with `>`, then comes the content, which can be text, or other elements, and then at the end comes the *end-tag*, which starts with ``. -``` - -Some content - -``` + + + Some content + An element can have any number of *child-elements*, which can again have child-elements to any level of nexting you want. -``` - - - My first web page - - -

Here is a paragraph

- - -``` + + + My first web page + + +

Here is a paragraph

+ + It is customary to indent child-elements, but it is not neccessary. It just makes it more *pretty*, and easier to read. Something like this is perfectly legal XML syntax: -``` -

Here is a paragraph

-``` + +

Here is a paragraph

##Where can I find more information? From 744646638c461017a2cca91255ffd0c991af804e Mon Sep 17 00:00:00 2001 From: Palle Cogburn <4thex@users.noreply.github.com> Date: Tue, 14 Oct 2014 06:02:29 -0700 Subject: [PATCH 8/9] Update description.md --- course/html5/description.md | 1 + 1 file changed, 1 insertion(+) diff --git a/course/html5/description.md b/course/html5/description.md index 3d3fa8c..8c53e06 100644 --- a/course/html5/description.md +++ b/course/html5/description.md @@ -23,6 +23,7 @@ An element can either have content, or be empty. An empty element must start with `<` and end with `/>`. In between is the name of the element and maybe some *attributes*, we'll get back to those. + The word `html` is the name of the element. An element in XML can have any name. From 584ba3c87a94fc076f8fcdc4849dfe795388b424 Mon Sep 17 00:00:00 2001 From: Palle Cogburn <4thex@users.noreply.github.com> Date: Wed, 15 Oct 2014 05:13:04 -0700 Subject: [PATCH 9/9] Update description.md --- course/html5/description.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/course/html5/description.md b/course/html5/description.md index 8c53e06..e1c994c 100644 --- a/course/html5/description.md +++ b/course/html5/description.md @@ -23,6 +23,11 @@ An element can either have content, or be empty. An empty element must start with `<` and end with `/>`. In between is the name of the element and maybe some *attributes*, we'll get back to those. +```ruby +require 'redcarpet' +markdown = Redcarpet.new("Hello World!") +puts markdown.to_html +```