From 0233a18f75d1de038fc011194e2f4610456cc09b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Sj=C3=B6lund?= <martin.sjolund@liu.se>
Date: Thu, 31 Oct 2019 11:21:44 +0100
Subject: [PATCH] Fix remaining issues with lab1/2 swapped

---
 doc/Makefile           | 2 +-
 doc/source/conf.py     | 2 +-
 doc/source/doxygen.rst | 4 ++--
 doc/source/lab1.rst    | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/doc/Makefile b/doc/Makefile
index 792d427..2f64266 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -16,7 +16,7 @@ help:
 
 # Catch-all target: route all unknown targets to Sphinx using the new
 # "make mode" option.  $(O) is meant as a shortcut for $(SPHINXOPTS).
-html: Makefile doxygen-lab1/xml/index.xml doxygen-lab3/xml/index.xml
+html: Makefile doxygen-lab2/xml/index.xml doxygen-lab3/xml/index.xml
 	@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
 	rm -rf "$(SOURCEDIR)/html/_source"
 
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 0f5c711..76da420 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -135,7 +135,7 @@ imgmath_dvisvgm_args = ['--no-fonts', '--exact']
 highlight_language = 'c++'
 
 breathe_projects = {
-  "lab1": "../doxygen-lab1/xml",
+  "lab2": "../doxygen-lab2/xml",
   "lab3": "../doxygen-lab3/xml"
 }
 
diff --git a/doc/source/doxygen.rst b/doc/source/doxygen.rst
index b0783ba..c14f9e1 100644
--- a/doc/source/doxygen.rst
+++ b/doc/source/doxygen.rst
@@ -1,11 +1,11 @@
 Source Documentation
 ====================
 
-Lab1
+Lab2
 ----
 
 .. doxygenindex::
-  :project: lab1
+  :project: lab2
 
 Lab3-4
 ------
diff --git a/doc/source/lab1.rst b/doc/source/lab1.rst
index 3c49785..3c0435f 100644
--- a/doc/source/lab1.rst
+++ b/doc/source/lab1.rst
@@ -1,4 +1,4 @@
-Lab 2: Scanner Specification
+Lab 1: Scanner Specification
 ============================
 
 The scanner is the part of the compiler responsible for grouping characters in the input stream into tokens which are used by the parser.
-- 
GitLab