diff --git a/01-one.html b/01-one.html
index 7e3b0f70c2d1716310b34645881339125de24be0..21f7f7c14cec9a8f592dcb0c4900a66365615ea7 100644
--- a/01-one.html
+++ b/01-one.html
@@ -34,7 +34,7 @@
Learning objective 2
-Paragraphs of text --- possibly including definitions --- mixed with:
+Paragraphs of text --- possibly including key word 1 --- mixed with:
some code:
to be displayed
output
@@ -57,10 +57,10 @@ program
diff --git a/01-one.md b/01-one.md
index ca4dc268d6b1539b9c418bc9c33993ebebd9c70e..48ccd6fbf94d194e591042db695b47878d051de1 100644
--- a/01-one.md
+++ b/01-one.md
@@ -4,12 +4,13 @@ title: Lesson Title
subtitle: Topic Title One
minutes: 10
---
-> ## Learning Objectives
+> ## Learning Objectives {.objectives}
>
> * Learning objective 1
> * Learning objective 2
-Paragraphs of text --- possibly including **definitions** ---
+Paragraphs of text
+--- possibly including [key word 1](reference.html#key-word-1) ---
mixed with:
~~~ {.python}
diff --git a/02-two.html b/02-two.html
index ea737d295cc7fb7a3cb5a0e9be2e976a531748b6..83de0ca4c4ead157422346899fdbe0fd3429be4c 100644
--- a/02-two.html
+++ b/02-two.html
@@ -34,7 +34,7 @@
Learning objective 2
-Paragraphs of text --- possibly including definitions --- mixed with:
+Paragraphs of text --- possibly including key word 2 --- mixed with:
some code:
to be displayed
output
@@ -48,15 +48,15 @@ program
Challenge Title
-
Description of a single challenge. There may be several challenges.
+
Description of a single challenge. There may be several challenges that make reference to Challenge Title.
diff --git a/02-two.md b/02-two.md
index 0412d1bb186e0dc2d7bba0c31f4d1b0c242f6441..037c40e70a5e25d7e9ed47766ae5fe524784e1ae 100644
--- a/02-two.md
+++ b/02-two.md
@@ -4,12 +4,13 @@ title: Lesson Title
subtitle: Topic Title Two
minutes: 10
---
-> ## Learning Objectives
+> ## Learning Objectives {.objectives}
>
> * Learning objective 1
> * Learning objective 2
-Paragraphs of text --- possibly including **definitions** ---
+Paragraphs of text
+--- possibly including [key word 2](reference.html#key-word-2) ---
mixed with:
~~~ {.python}
@@ -34,4 +35,5 @@ and possibly including:
> ## Challenge Title {.challenge}
>
> Description of a single challenge.
-> There may be several challenges.
+> There may be several challenges
+> that make reference to [Challenge Title](01-one.html#challenge-title).
diff --git a/LAYOUT.md b/LAYOUT.md
index 12558998394246ebe9617141d3975a232f6c24d6..915a6086859eae463703891a9382d131cf49096b 100644
--- a/LAYOUT.md
+++ b/LAYOUT.md
@@ -167,12 +167,13 @@ Each topic page must be structured as follows:
subtitle: Topic Title
minutes: 10
---
- > ## Learning Objectives
+ > ## Learning Objectives {.objectives}
>
> * Learning objective 1
> * Learning objective 2
- Paragraphs of text --- possibly including **definitions** ---
+ Paragraphs of text
+ --- possibly including [definitions](reference.html#definitions) ---
mixed with:
~~~ {.python}
@@ -219,9 +220,9 @@ Each topic page must be structured as follows:
3. Every challenge should relate explicitly back to a learning
objective.
-4. Definitions of terms are marked in **bold** (like `**this**`).
- Nothing else should be marked as bold text --- use *italics* for
- for all other emphasis.
+4. Definitions are links with fragment identifier to `reference.html`
+ (like `[definitions](reference.html#definitions)`).
+ This is need to enable links from name diferent from the key word defined.
5. When laying out source code, use `{.lang}` as a style on the
opening `~~~` line. For Unix Shell commands use:
@@ -307,10 +308,10 @@ a definition list:
## Glossary
- Key Word 1
+ key word 1
: Definition of first term
- Key Word 2
+ key word 2
: Definition of second term
## Discussion Page
diff --git a/LICENSE.html b/LICENSE.html
index 1cedf051dc46511a5209b9c9b95f6d2f22e23197..a789bd630986453155abfdbdf97fafb93438e466 100644
--- a/LICENSE.html
+++ b/LICENSE.html
@@ -58,10 +58,10 @@
diff --git a/discussion.html b/discussion.html
index 16a587f8d5c907c1595076fcb01baad1d7a1ca85..772ad8fec8eb96f0f9a47f39954e4ea90ecfb3c8 100644
--- a/discussion.html
+++ b/discussion.html
@@ -35,10 +35,10 @@
diff --git a/index.html b/index.html
index 3e8460dccda890690aba551297e18f4d9e2854e8..25113988e1462e92e796f328654286b9ef7d0afb 100644
--- a/index.html
+++ b/index.html
@@ -47,10 +47,10 @@
diff --git a/index.md b/index.md
index 707978010ae46b613ea310d2b51f878c2af21931..00999785baa1f0163d3cc74fc2620148ff7ede19 100644
--- a/index.md
+++ b/index.md
@@ -4,7 +4,7 @@ title: Lesson Title
---
Paragraph of introductory material.
-> ## Prerequisites
+> ## Prerequisites {.prereq}
>
> A short paragraph describing what learners need to know
> before tackling this lesson.
diff --git a/instructors.html b/instructors.html
index 5efadb7ac21b1440133d13973aa45d8d0c000693..f3f73ba2b188996e0900e823431589a8008c59d7 100644
--- a/instructors.html
+++ b/instructors.html
@@ -56,10 +56,10 @@
diff --git a/reference.html b/reference.html
index 88f0f98e8a9a277ac1834a0a41cc6b6f7a3a7886..58ba3102e46b94864d05f64a46b598f54678975f 100644
--- a/reference.html
+++ b/reference.html
@@ -33,20 +33,20 @@
...commands and examples...
Glossary
-- Key Word 1
+- key word 1
- Definition of first term
-- Key Word 2
+- key word 2
- Definition of second term
diff --git a/reference.md b/reference.md
index 8d0c4fe2df8699275b7a4eed2321c4a4af7ece2f..b202f9d13366a0fca762f9e758e0d05f784ddc88 100644
--- a/reference.md
+++ b/reference.md
@@ -13,8 +13,8 @@ subtitle: Reference
## Glossary
-Key Word 1
+key word 1
: Definition of first term
-Key Word 2
+key word 2
: Definition of second term
diff --git a/tools/filters/blockquote2div.py b/tools/filters/blockquote2div.py
index 844fc11113be4403825b540d1f85416be9fead50..828f74c48fbb3e8b4f2886e0f318f944cc281ea7 100755
--- a/tools/filters/blockquote2div.py
+++ b/tools/filters/blockquote2div.py
@@ -95,8 +95,6 @@ def blockquote2div(key, value, format, meta):
id, classes, kvs = attr
- ltitle = pf.stringify(inlines).lower()
-
if len(classes) == 1 and classes[0] in SPECIAL_CLASSES:
remove_attributes(blockquote)
# a blockquote is just a list of blocks, so it can be