Still more borked links

8 files changed, 13 insertions, 10 deletions

diff --git a/GNUmakefile b/GNUmakefile
index 6298f56..7a13d6d 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -11,4 +11,7 @@ clean:
 distclean: clean
 	rm -rf trac.db attachments
 
-.PHONY: all clean fetch distclean
+webfsd:
+	webfsd -r pelican/website -4 -L - -F -f index.html
+
+.PHONY: all clean fetch distclean webfsd
diff --git a/pelican/content/AlphaBoardComponents.md b/pelican/content/AlphaBoardComponents.md
index 614e416..3dfd1fa 100644
--- a/pelican/content/AlphaBoardComponents.md
+++ b/pelican/content/AlphaBoardComponents.md
@@ -6,7 +6,7 @@ This document contains a list of component level description and requirements fo
 
 The document is to be used as a BOM (Bill Of Materials) and PCB design requirement description for discussing with PCB designers on what we want to have designed.  
 
-The block diagram for the Alpha board can be seen at: [wiki:Hardware]
+The block diagram for the Alpha board can be seen at: [Hardware](Hardware)
 
 The Alpha board basically consists of three major sub systems:  
 
diff --git a/pelican/content/DevBridgeBoard.md b/pelican/content/DevBridgeBoard.md
index baadc97..efef738 100644
--- a/pelican/content/DevBridgeBoard.md
+++ b/pelican/content/DevBridgeBoard.md
@@ -5,7 +5,7 @@ Modified: 2021-02-14 17:30
 
 
 # dev-bridge board
-In the process of developing the [wiki:AlphaBoardComponents] design, the project has made what is known as the "dev-bridge board".
+In the process of developing the [AlphaBoardComponents](AlphaBoardComponents) design, the project has made what is known as the "dev-bridge board".
 
 This is a board, 100x70 mm, with about 2/3 of the components intended to be on the Alpha design. What is missing is basically the FPGA and it's supporting circuits.
 
diff --git a/pelican/content/DisasterRecovery.md b/pelican/content/DisasterRecovery.md
index 277b2ab..08bfd6f 100644
--- a/pelican/content/DisasterRecovery.md
+++ b/pelican/content/DisasterRecovery.md
@@ -21,7 +21,7 @@ PIN: <your-wheel-pin>
 ### Recovering from a bad bootloader install
 
 Well, now you've done it. You'll need to buy an ST-LINK programmer.
-See [wiki:UsingSTLink].
+See [UsingSTLink](UsingSTLink).
 
 ## Oh no, I'm locked out of my device
 
diff --git a/pelican/content/ProjectStatus.md b/pelican/content/ProjectStatus.md
index 3e468b8..fb59d88 100644
--- a/pelican/content/ProjectStatus.md
+++ b/pelican/content/ProjectStatus.md
@@ -13,8 +13,8 @@ Date: 2016-12-15 22:44
 * AlphaBoardStrategy
 * AlphaBoardComponents
 * [Core Git Repository](http://trac.cryptech.is/wiki/GitRepositories/core)
-* [wiki:Hardware]
-* [wiki:DevBridgeBoard]
+* [Hardware](Hardware)
+* [DevBridgeBoard](DevBridgeBoard)
 
 
 ## Pilot Project
diff --git a/pelican/content/UpgradeToKSNG.md b/pelican/content/UpgradeToKSNG.md
index e061fcf..186c6e9 100644
--- a/pelican/content/UpgradeToKSNG.md
+++ b/pelican/content/UpgradeToKSNG.md
@@ -83,7 +83,7 @@ just replace the old package with the new one.  Homebrew, on the other
 hand, reports the conflict and refuses to proceed until you sort it out.
 
 The following assumes that you already had the Cryptech APT repository
-or Homebrew tap configured; if not, see  [[wiki:BinaryPackages]].
+or Homebrew tap configured; if not, see  [BinaryPackages](BinaryPackages).
 
 ### Installing cryptech-alpha-ksng package using apt-get on Debian or Ubuntu Linux
 
diff --git a/pelican/content/Upgrading.md b/pelican/content/Upgrading.md
index fd3ed34..76139c7 100644
--- a/pelican/content/Upgrading.md
+++ b/pelican/content/Upgrading.md
@@ -49,7 +49,7 @@ your Alpha, see DisasterRecovery.
 ## Upgrading from 'ksng'
 
 A few intrepid users are already testing the 'ksng' development branch,
-using the instructions at [wiki:UpgradeToKSNG]. In this case, and with future
+using the instructions at [UpgradeToKSNG](UpgradeToKSNG). In this case, and with future
 upgrades, it it not necessary to either wipe the keystore or upgrade the
 bootloader.
 
diff --git a/trac2md.py b/trac2md.py
index 9a41d1c..6645bc7 100755
--- a/trac2md.py
+++ b/trac2md.py
@@ -15,7 +15,7 @@ from datetime import datetime
 from urllib.parse import quote
 
 wikilink_1_pattern = re.compile("\[\[(http.*)\]\]|\[(http.*)\]")
-wikilink_2_pattern = re.compile("\[\[([a-zA-Z0-9_]+)\]\]")
+wikilink_2_pattern = re.compile("\[\[(?:wiki:)?([a-zA-Z0-9_]+)\]\]|\[wiki:([a-zA-Z0-9_]+)\]")
 strikethrough_pattern = re.compile("~~(.*)~~")
 camelcase_pattern = re.compile("!(\w+)")
 image_pattern = re.compile("\[\[Image\((.*)\)\]\]")
@@ -91,7 +91,7 @@ def convert_wikilinks_2(line):
     ''' Convert more wiki links'''
     m = wikilink_2_pattern.search(line)
     if m:
-        text = m.group(1)
+        text = m.group(1) or m.group(2)
         if text.lower() == "pageoutline":
             mdlink = ""
         else: