slebok
diff --git a/Abstract data type.md b/Abstract data type.md
@@ -13,4 +13,5 @@
 
 ## Russian
 * _абстрактный тип данных_
+* Short: _АТД_
 * Wikipedia: http://ru.wikipedia.org/wiki/Абстрактный_тип_данных
diff --git a/Abstract syntax tree.md b/Abstract syntax tree.md
@@ -9,4 +9,5 @@
 
 ## Russian
 * _абстрактное синтаксическое дерево_
+* Short: _АСД_
 * Wikipedia: http://ru.wikipedia.org/wiki/Абстрактное_синтаксическое_дерево
diff --git a/Aspect-oriented programming.md b/Aspect-oriented programming.md
@@ -13,4 +13,5 @@
 
 ## Russian
 * _аспектно-ориентированное программирование_
+* Short: _АОП_
 * Wikipedia: http://ru.wikipedia.org/wiki/Аспектно-ориентированное_программирование
diff --git a/Backus-Naur form.md b/Backus-Naur form.md
@@ -13,4 +13,5 @@
 
 ## Russian
 * _форма Бэкуса — Наура_
+* Short: _БНФ_
 * Wikipedia: http://ru.wikipedia.org/wiki/Форма_Бэкуса_—_Наура
diff --git a/Context-free grammar.md b/Context-free grammar.md
@@ -1,7 +1,7 @@
 ## English
 * _context-free grammar_
 * Short: _CFG_
-* Definition: **Context-free grammar** (CFG) is a [[formal grammar]] in which every [[production rule]] has a form of `n → w`, where `n` is a single [[nonterminal symbol]] and `w` is a sequence of [[terminals|terminal symbol]] and nonterminals.
+* Definition: a [[formal grammar]] in which every [[production rule]] has a form of `n → w`, where `n` is a single [[nonterminal symbol]] and `w` is a sequence of [[terminals|terminal symbol]] and nonterminals.
 * Wikipedia: http://en.wikipedia.org/wiki/Context-free_grammar
 
 ## German

diff --git a/Deterministic context-free grammar.md b/Deterministic context-free grammar.md
@@ -1,7 +1,7 @@
 ## English
 * _deterministic context-free grammar_
 * Short: _DCFG_
-* Definition: **Deterministic context-free grammar** (DCFG) is a [[context-free grammar]] that can be derived from a [[deterministic pushdown automaton]] (DPDA).
+* Definition: a [[context-free grammar]] that can be derived from a [[deterministic pushdown automaton]] (DPDA).
 * Publication: [*On Context-Free Languages and Push-Down Automata*](http://genome.univ-mlv.fr/~berstel/Mps/Travaux/A/1963-5CflPdaInfCtl.pdf)
 * Publication: [*Application of Pushdown-Store Machines*](http://dx.doi.org/10.1145/1463822.1463848)
 * Wikipedia: http://en.wikipedia.org/wiki/Deterministic_context-free_grammar

diff --git a/Extended Backus-Naur form.md b/Extended Backus-Naur form.md
@@ -9,4 +9,5 @@
 
 ## Russian
 * _расширенная форма Бэкуса — Наура_
+* Short: _РБНФ_
 * Wikipedia: http://ru.wikipedia.org/wiki/Расширенная_форма_Бэкуса_—_Наура
diff --git a/Fold-over.md b/Fold-over.md
@@ -1,6 +1,7 @@
 ## English
 * _fold-over_
-* Definition: **Fold-over** (`^^`) is a tree manipulation annotation used in [[Tear-Insert-Fold grammars|Tear-Insert-Fold grammar]] and [[Tear-Fold grammars|Tear-Fold grammar]]. The node corresponding to `x^^` replaces its parent node, and its siblings are added to its children.
+* Short: `^^`
+* Definition: a tree manipulation annotation used in [[Tear-Insert-Fold grammars|Tear-Insert-Fold grammar]] and [[Tear-Fold grammars|Tear-Fold grammar]]. The node corresponding to `x^^` replaces its parent node, and its siblings are added to its children.
 * Publication: [*Tear-Insert-Fold Grammars*](http://dx.doi.org/10.1145/1868281.1868287)
 
 ## Russian

diff --git a/Fold-under.md b/Fold-under.md
@@ -1,6 +1,7 @@
 ## English
 * _fold-under_
-* Definition: **Fold-under** (`^`) is a tree manipulation annotation used in [[Tear-Insert-Fold grammars|Tear-Insert-Fold grammar]] and [[Tear-Fold grammars|Tear-Fold grammar]]. The node corresponding to `x^` is deleted, and its children become children of its parent.
+* Short: `^`
+* Definition: a tree manipulation annotation used in [[Tear-Insert-Fold grammars|Tear-Insert-Fold grammar]] and [[Tear-Fold grammars|Tear-Fold grammar]]. The node corresponding to `x^` is deleted, and its children become children of its parent.
 * Publication: [*Tear-Insert-Fold Grammars*](http://dx.doi.org/10.1145/1868281.1868287)
 
 ## Russian

diff --git a/Fold.md b/Fold.md
@@ -3,5 +3,5 @@
 * Wikipedia: http://en.wikipedia.org/wiki/Fold_%28higher-order_function%29
 
 ## Russian
-* _свёртка_, _катаморфизм_
+* _свёртка_; _катаморфизм_
 * Wikipedia: http://ru.wikipedia.org/wiki/Свёртка_списка
diff --git a/Home.md b/Home.md
@@ -85,7 +85,7 @@
 * [[Multi-paradigm programming]]
 * [[Multiple inheritance]]
 * [[Narrow]]
-* [[Nonterminal]]
+* [[Nonterminal symbol]]
 * [[Object-oriented]]
 * [[Parse tree]]
 * [[Parsing expression grammar]]
@@ -120,7 +120,7 @@
 * [[Tear-Fold grammar]]
 * [[Tear-Insert-Fold grammar]]
 * [[Tear]]
-* [[Terminal]]
+* [[Terminal symbol]]
 * [[Test-driven development]]
 * [[Tester driven development]]
 * [[Trait]]

diff --git a/Nonterminal symbol.md b/Nonterminal symbol.md
@@ -0,0 +1,7 @@
+## English
+* _nonterminal symbol_
+* Short: _nonterminal_
+
+## Russian
+* _нетерминальный символ_
+* Short: _нетерминал_
diff --git a/Nonterminal.md b/Nonterminal.md
@@ -1,5 +0,0 @@
-## English
-* _nonterminal_
-
-## Russian
-* _нетерминал_

diff --git a/Tear-Insert-Fold grammar.md b/Tear-Insert-Fold grammar.md
@@ -1,5 +1,5 @@
 ## English
-* _Tear-Insert-Fold grammar_, _Tear-Insertion-Fold grammar_
+* _Tear-Insert-Fold grammar_; _Tear-Insertion-Fold grammar_
 * Short: _TIF-grammar_
 * Definition: **Tear-Insert-Fold grammar** or **Tear-Insertion-Fold grammar** (TIF-grammar) is a [[context-free grammar]], where symbols are allowed to have [[tear]], [[insert]], [[fold-under]] and [[fold-over]] annotations. A TIF-grammar without [[insert]] annotations is called a [[Tear-Fold grammar]].
 * Publication: [*Tear-Insert-Fold Grammars*](http://dx.doi.org/10.1145/1868281.1868287)
diff --git a/Tear.md b/Tear.md
@@ -1,4 +1,5 @@
 ## English
 * _tear_
-* Definition: **Tear** (`^^^`) is a tree manipulation annotation used in [[Tear-Insert-Fold grammars|Tear-Insert-Fold grammar]] and [[Tear-Fold grammars|Tear-Fold grammar]]. The node corresponding to `x^^^` is deleted together with its children.
+* Short: `^^^`
+* Definition: a tree manipulation annotation used in [[Tear-Insert-Fold grammars|Tear-Insert-Fold grammar]] and [[Tear-Fold grammars|Tear-Fold grammar]]. The node corresponding to `x^^^` is deleted together with its children.
 * Publication: [*Tear-Insert-Fold Grammars*](http://dx.doi.org/10.1145/1868281.1868287)
diff --git a/Terminal symbol.md b/Terminal symbol.md
@@ -1,6 +1,7 @@
 ## English
 * _terminal symbol_
-* Short: _terminal_ or _терминал_
+* Short: _terminal_
 
 ## Russian
 * _терминальный символ_
+* Short: _терминал_
diff --git a/Unfold.md b/Unfold.md
@@ -7,4 +7,4 @@
 * Wikipedia: http://nl.wikipedia.org/wiki/Anamorfisme
 
 ## Russian
-* _развёртка_, _анаморфизм_
+* _развёртка_; _анаморфизм_