Merge pull request #155 from HACManchester/fix-redirects

Fix broken links and add redirects for old paths

Author: rjackson

README.md

@@ -5,32 +5,6 @@ This repo contains the official documentation for Hackspace Manchester. All memb
 
 The syntax in use is markdown, for editing pages it is suggested to use an online markdown editor such as https://stackedit.io/app#
 
-Tags
-----
-
-This repo now has support for tags within the documentation. To add a tag to a page as an example
-
-Add something like this to the top of the page to add a tag **docs/Tools_Equipment/Wood_Working/Table_Saw_ts2500.md**
-
-```
----
-tags:
-  - Equipment
----
-```
-
-Next if the Tag is a new tag we need to create a page for it to show all pages that are a member of this tag **docs/tags/Equipment.md**
-
-```
----
-pagetype: tagpage
----
-
-# Tag: Equipment
-
-Equipment related pages
-```
-
 Getting Started
 ---------------
 
@@ -51,16 +25,10 @@ If you want to get a better preview of what the changes will look like when rend
 1.	Fork this repo and clone it to your local machine
 2.	Edit the .md files within the `docs` directory, (for best results something like vscode with markdown preview)
 3.	Install python 3.6+
-4.	Install the below packages
+4.	Install dependencies
 
 	```sh
-	# These can be seen here - https://github.com/HACManchester/documentation/blob/master/.github/workflows/ci.yml
-	pip install mkdocs
-	pip install mkdocs-material
-	pip install git+https://github.com/srymh/MkdocsTagPlugin.git@ac1f02ba95527d11d84b5ec87f4e63851d57fc7d
-	pip install git+https://github.com/rkoe/mkdocs-emailprotect@ef91e3dda367bd6a3f65dda183559e1b929d6240
-	pip install mkdocs-git-revision-date-localized-plugin
-    pip install mkdocs mkdocs-video
+	pip install -r requirements.txt
 	```
 
 Then we can use the build.py wrapper script

docs/adding_documentation.md

@@ -13,7 +13,7 @@ Create a pull request with a new markdown file in the documentation repository a
 
 #### Non github user 
 
-Create a markdown text file (try [stackedit.io](stackedit.io) if you want  a simple editor) and email the output to [email protected] and we will add it to the repo on your behalf
+Create a markdown text file (try [stackedit.io](https://stackedit.io) if you want  a simple editor) and email the output to [email protected] and we will add it to the repo on your behalf
 
 #### Helpful links
 

docs/equipment/3d_printers/overview.md

@@ -4,8 +4,8 @@
 
 ### List of Printers
 
-- [Prusa MK4's](../PrusaMK4/)
-- [Prusa XL](../PrusaXL4/)
+- [Prusa MK4's](prusa_mk4.md)
+- [Prusa XL](prusa_xl4.md)
 - Sunlu printer (Courtney), larger than the enders
 - Resin Printer (Bob Jr.) Elegoo Mars Pro
 

docs/equipment/3d_printers/prusa_mk4.md

@@ -22,19 +22,19 @@ Download [PrusaSlicer](https://www.prusa3d.com/en/page/prusaslicer_424/?)
 
 Click "add/remove presets""
 
-![f](/images/3D-Printers/p4_add.png)
+![f](../../images/3D-Printers/p4_add.png)
 
 ---
 
 Select MK4 with or without [Input Shaping](https://help.prusa3d.com/article/input-shaper-mk4-xl-mini-_451816)
 
-![](/images/3D-Printers/P4_1.png)
+![](../../images/3D-Printers/P4_1.png)
 
 ---
 
 Press "add physical printer"
 
-![](/images/3D-Printers/p4_physical.png)
+![](../../images/3D-Printers/p4_physical.png)
 
 ---
 
@@ -45,21 +45,21 @@ Then add in the following details
 | Kim     | 172.16.0.123 | dmAPJnhhJ37VXBV |
 | Romanov | 172.16.0.124 | JZXE4a9SUKAKWEw |
 
-![dd](/images/3D-Printers/P4_3.png)
+![dd](../../images/3D-Printers/P4_3.png)
 
 ---
 
 ### Printing from PrusaSlicer
 
 Pressing the button next to "export g code" will send your file to a physical printer, if it doesn't work make sure you have a physical printer selected and not a generic preset.
 
-![ff](/images/3D-Printers/P4_6.png)
+![ff](../../images/3D-Printers/P4_6.png)
 
 ## Using the Prusa's **without** PrusaSlicer
 
 It is perfectly fine if you want to use the Prusa's with a different slicer or [custom G-code.](https://fullcontrol.xyz/)
 
-Simply visit the IP-Address from [Printer Connection Information](#printer-connection-information) to use [PrusaLink.](https://help.prusa3d.com/guide/wi-fi-and-prusalink-setup-mk4-mk3-9-xl-mini-_413293#416077)
+Simply visit the IP-Address from Printer Connection Information to use [PrusaLink.](https://help.prusa3d.com/guide/wi-fi-and-prusalink-setup-mk4-mk3-9-xl-mini-_413293#416077)
 
 Use "maker" as the username and the Prusa-Link key as the password.
 
@@ -68,7 +68,7 @@ Use "maker" as the username and the Prusa-Link key as the password.
 | maker    | 172.16.0.123 | dmAPJnhhJ37VXBV |
 | maker    | 172.16.0.124 | JZXE4a9SUKAKWEw |
 
-![3.png](/images/3D-Printers/P4_4.png)
+![3.png](../../images/3D-Printers/P4_4.png)
 
 ---
 

docs/equipment/3d_printers/prusa_xl4.md

@@ -13,7 +13,7 @@ remove.
 Remove jewellery.
 Ensure no one is near moving parts before starting a print.
 
-Get familiar with the [mk4](PrusaMK4.md)'s before using this printer
+Get familiar with the [mk4](prusa_mk4.md)'s before using this printer
 
 | Username | Ip_address      | API_Key    
 | -------- | --------------- | ------------ |

docs/equipment/cnc/chunky_cnc/feeds_and_speeds renamed to docs/equipment/cnc/chunky_cnc/feeds_and_speeds.md

@@ -4,7 +4,7 @@ The bandsaw is a Clarke CBS45M, a convertable horizontal / vertical
 bandsaw, designed for cutting metal bar, rod and tube down to length. It
 has a 1/2hp 370w motor, and is commonly fitted with a 14TPI blade.
 
-[CBS45M Manual](Media:CBS45MD_Bandsaw_rev_4.pdf "wikilink")
+[CBS45M Manual](../../../instruction_manuals/CBS45MD_Bandsaw_Rev_5.pdf)
 
 ## Status
 
@@ -125,9 +125,6 @@ The below is the junction box below the zero power switch
 ### Risk Assessment
 [Metal Bandsaw Risk Assessment](https://docs.google.com/document/d/1L63IFT2mtebCvb3mKpEstMLqN3Si-7PQvn6bUsV1nFw/edit?usp=sharing)
 
-
-![<File:Metal_BandSaw.svg>](Metal_BandSaw.svg "File:Metal_BandSaw.svg")
-
 [Category:Equipment](Category:Equipment "wikilink")
 [Category:Metalspace](Category:Metalspace "wikilink") [Category:Team
 Metal](Category:Team_Metal "wikilink")

docs/equipment/metalwork/equipment/metal_bandsaw.md

@@ -129,12 +129,12 @@ material can be supplied by the space for a small fee.
 
 ### Myford ML7
 
-![<File:MyfordML7Manual.pdf>](MyfordML7Manual.pdf "fig:File:MyfordML7Manual.pdf")
+[Myford ML7 Manual](../../../instruction_manuals/metal_lathe_ml7.pdf)
 Purely the basic factory manual.
 
 ### Warco 220
 
-[Warco 220 Manual](/instruction_manuals/Warco-Lathe-220.pdf)
+[Warco 220 Manual](../../../instruction_manuals/Warco-Lathe-220.pdf)
 
 ## Risk Assessment
 

docs/equipment/metalwork/equipment/metal_lathe.md

@@ -5,4 +5,4 @@ TODO
 
 ## Instruction Manuals
 
-[DRO Manual](/instruction_manuals/Mill/dro-sds6.pdf)
+[DRO Manual](../../../instruction_manuals/Mill/dro-sds6.pdf)

docs/equipment/metalwork/equipment/metal_mill.md

@@ -12,7 +12,7 @@ machine.
 
 ### Manual
 
-![<File:Lervia564manual.pdf>](Lervia564manual.pdf "File:Lervia564manual.pdf")
+![Lervia 564 Manual](../../../instruction_manuals/sewingmachine_Lervia.pdf)
 
 ## Singer 4423 Heavy Duty
 
@@ -24,13 +24,10 @@ leather.
 ### Manual
 
 Quick Start guide -
-![<File:SingerQuickStartGuide4432.pdf>](SingerQuickStartGuide4432.pdf "fig:File:SingerQuickStartGuide4432.pdf")
+[Singer Quick Start Guide](../../../instruction_manuals/SingerQuickStartGuide4432.pdf)
 
 Full Manual -
-![<File:Singer4423Manual.pdf>](Singer4423Manual.pdf "fig:File:Singer4423Manual.pdf")
-
-Service Manual -
-![<File:Singer4423ServiceManual.pdf>](Singer4423ServiceManual.pdf "fig:File:Singer4423ServiceManual.pdf")
+[Singer 4423 Manual](../../../instruction_manuals/Singer4423Manual.pdf)
 
 ### Risk Assessment
 [Sewing Machine Risk Assessment](https://docs.google.com/document/d/1aUZWDqhOVUsFNbLjxgr4PFD62l2zbHXBCNHzI7B_ajg/edit?usp=sharing)

docs/equipment/visual_arts/equipment/sewing_machines.md

@@ -11,9 +11,9 @@ If in doubt check with the welding area co-ordinator before buying.
 
 | Item                                                                                                                                  | Machine / Tool                                             | Notes |
 |---------------------------------------------------------------------------------------------------------------------------------------|------------------------------------------------------------|-------|
-| [Welding wire 0.6mm](https://www.basicwelding.co.uk/collections/mild-steel-mig-welding-wire/products/mild-steel-mig-wire-0-8mm-0-7kg) | [XTM 201Di Inverter MIG](Equipment/Welding_Machines.md) |       |
-| [Welding wire 0.8mm ](https://www.basicwelding.co.uk/products/mild-steel-mig-wire-0-6mm-0-7kg)                                        | [XTM 201Di Inverter MIG](Equipment/Welding_Machines.md)    |       |
-| [20L Argon 5% Gas Bottle](https://www.basicwelding.co.uk/pages/rent-free-welding-gas-manchester)                                      | [XTM 201Di Inverter MIG](Equipment/Welding_Machines.md)    |       |
+| [Welding wire 0.6mm](https://www.basicwelding.co.uk/collections/mild-steel-mig-welding-wire/products/mild-steel-mig-wire-0-8mm-0-7kg) | [XTM 201Di Inverter MIG](equipment/welding_machines.md) |       |
+| [Welding wire 0.8mm ](https://www.basicwelding.co.uk/products/mild-steel-mig-wire-0-6mm-0-7kg)                                        | [XTM 201Di Inverter MIG](equipment/welding_machines.md)    |       |
+| [20L Argon 5% Gas Bottle](https://www.basicwelding.co.uk/pages/rent-free-welding-gas-manchester)                                      | [XTM 201Di Inverter MIG](equipment/welding_machines.md)    |       |
 
 ## Grinding
 
@@ -27,5 +27,5 @@ The following is a list of recommended discs for grinding and cutting:
 
 | Item                                                                                                                        | Machine / Tool                                    | Notes |
 |-----------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------|-------|
-| [115MM (4.5") Grinding Disk](https://www.zoro.co.uk/shop/abrasives/grinding/115mm-4-5inch-metal-grinding-disc/p/ZT1012573S) | [Lumberjack 820W](Equipment/Angle_Grinders.md) |       |
-| [115MM (4.5") Cutting Disk ](https://www.amazon.co.uk/SHDIATOOL-Diamond-Cut-Off-Cutting-Abrasive/dp/B0C6D5DS92/?th=1)       | [Lumberjack 820W](Equipment/Angle_Grinders.md) |       |
+| [115MM (4.5") Grinding Disk](https://www.zoro.co.uk/shop/abrasives/grinding/115mm-4-5inch-metal-grinding-disc/p/ZT1012573S) | [Lumberjack 820W](equipment/angle_grinders.md) |       |
+| [115MM (4.5") Cutting Disk ](https://www.amazon.co.uk/SHDIATOOL-Diamond-Cut-Off-Cutting-Abrasive/dp/B0C6D5DS92/?th=1)       | [Lumberjack 820W](equipment/angle_grinders.md) |       |

docs/equipment/welding/consumables.md

@@ -3,7 +3,7 @@ Bandsaws
 
 |                 | Record Power                 | Axminster                       |
 |-----------------|------------------------------|---------------------------------|
-|                 | ![img](../Training/8211.jpg) | ![img](../Training/ap2920b.jpg) |
+|                 | ![img](../training/8211.jpg) | ![img](../training/ap2920b.jpg) |
 | Model No.       | BS12                         | AP2920B                         |
 | Location        | Woodwork, Freestanding       | Woodwork, Freestanding          |
 | Training        | Induction                    | Induction                       |
@@ -26,8 +26,8 @@ Bandsaws
 
 Please review the bandsaw training before your induction session. For your induction you will be asked the theory questions and required to demonstrate the procedures in the practical session.
 
--	[Bandsaw Training](../Training/Bandsaw.md)
--	[Bandsaw Induction](../Inductions/Bandsaw.md)
+-	[Bandsaw Training](../training/bandsaw.md)
+-	[Bandsaw Induction](../inductions/bandsaw.md)
 
 ### **Risk Assessment**
 

docs/equipment/woodwork/equipment/bandsaw.md

@@ -66,10 +66,10 @@ During an emergency, if the workshop safety switches are triggered the machine w
 
 #### Training
 
--	[Training Content](../Training/MitreSaw.md)
--	[Test Content](../Training/MitreSaw.md)
--	[Mitre Saw Checklist (pdf)](../Inductions/MitreSaw.pdf)
--	[Mitre Saw Checklist (docx)](../Inductions/MitreSaw.docx)
+-	[Training Content](../training/mitre_saw.md)
+-	[Test Content](../training/mitre_saw.md)
+-	[Mitre Saw Checklist (pdf)](../inductions/mitre_saw.pdf)
+-	[Mitre Saw Checklist (docx)](../inductions/mitre_saw.docx)
 
 ### Manuals
 

docs/equipment/woodwork/equipment/mitre_saw.md

@@ -72,7 +72,7 @@ During an emergency, if the workshop safety switches are triggered the machine w
 
 ### **Induction Docs**
 
-  * [PillarDrill.pdf](../Inductions/PillarDrill.pdf)
+  * [PillarDrill.pdf](../inductions/pillar_drill.pdf)
 
 ---
 

docs/equipment/woodwork/equipment/pillar_drill.md

@@ -41,10 +41,10 @@ As standard the space stocks replacement blades for these machines as listed on
 
 These machines require extra Training to use and are included in the WoodyDusty Table Saw Training & Safety Induction.
 
--	[Training Content](../Training/TableSaw.md)
--	[Test Content](../Inductions/TableSaw.md)
--	[Table Saw Checklist (pdf)](../Inductions/TableSaw.pdf)
--	[Table Saw Checklist (docx)](../Inductions/TableSaw.docx)
+-	[Training Content](../training/table_saw.md)
+-	[Test Content](../inductions/table_saw.md)
+-	[Table Saw Checklist (pdf)](../inductions/table_saw.pdf)
+-	[Table Saw Checklist (docx)](../inductions/table_saw.docx)
 
 ### Safety
 

docs/equipment/woodwork/equipment/table_saw.md

@@ -19,6 +19,6 @@ Wood Lathes
 
 Wood lathe inductions are in person. You will be asked the questions linked below. You will be expected to understand general workshop protocols so please review the general training, particularly if this is your first in-person induction.
 
--	[General Training](../Training/General.md)
--	[General Induction](../Inductions/General.md)
--	[Wood Lathe Induction](../Inductions/WoodLathe.md)
+-	[General Training](../training/general.md)
+-	[General Induction](../inductions/general.md)
+-	[Wood Lathe Induction](../inductions/wood_lathe.md)

docs/equipment/woodwork/equipment/wood_lathe.md

@@ -4,7 +4,7 @@ Bandsaw
 Pre-requisite training
 ----------------------
 
-[General](General.md)
+[General](general.md)
 
 What is it for?
 ---------------

docs/equipment/woodwork/training/bandsaw.md

@@ -1,7 +1,7 @@
 Home
 ====
 
-![edit](/images/space.jpg)
+![edit](images/space.jpg)
 
 Welcome to the Manchester Hackspace Wiki Site!
 Here you will find a lot of the information you need to get making in our community.