From 345efdce3be3bbc52a64765574b9309272963ffa Mon Sep 17 00:00:00 2001
From: Altai-man <altay-man@mail.ru>
Date: Fri, 22 Jul 2016 21:19:14 +0300
Subject: [PATCH] Fix for merge conflict

---
 doc/Language/glossary.pod6 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/Language/glossary.pod6 b/doc/Language/glossary.pod6
index 39b96054c..485fc1d6f 100644
--- a/doc/Language/glossary.pod6
+++ b/doc/Language/glossary.pod6
@@ -556,7 +556,7 @@ The C<mainline> is the program text that is not part of any kind of block.
     f();        # in mainline again
 
 You can also have the mainline of any package-like declarator, such as
-class, L<module|#Module>, L<grammar|#Grammar>, etc.  These are
+L<class|#Class>, L<module|/language/modules>, L<grammar|/language/grammars>, etc.  These are
 typically run just after the class/module/grammar have been compiled (or
 when loaded from a pre-compiled file).
 
@@ -763,7 +763,7 @@ X<|Stub>
 X<|Symbol>
 
 Fancy alternative way to denote a name. Generally used in the context of
-L<module|#Module>s linking, be it in the OS level, or at the Perl 6 L<#VM> level
+L<module|/language/modules>s linking, be it in the L<#OS> level, or at the Perl 6 L<#Virtual Machine> level
 for modules generated from languages targeting these VMs.  The set of
 imported or exported symbols is called the symbol table.
 
@@ -830,7 +830,7 @@ A virtual machine is the Perl compiler entity that executes the
 L<bytecode|#Bytecode>.  It can optimize the bytecode or generate
 machine code Just in Time.  Examples are
 L<#MoarVM>, L<#Parrot> (who are intended to run Perl 6) and more
-generic virtual machines such as JVM and L<#Javascript>.
+generic virtual machines such as L<#JVM> and Javascript.
 
 =head1 whitespace
 X<|whitespace>