diff --git a/docs/3+1_data_recovery.md b/docs/3+1_data_recovery.md
deleted file mode 100644
index 315fb620b..000000000
--- a/docs/3+1_data_recovery.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-tags:
- - No Category
----
-1. REDIRECT [3+1 Data Recovery](3+1_data_recovery.md)
\ No newline at end of file
diff --git a/docs/automatic_fingerprint_identification_system.md b/docs/automatic_fingerprint_identification_system.md
index a403013be..945dbfb40 100644
--- a/docs/automatic_fingerprint_identification_system.md
+++ b/docs/automatic_fingerprint_identification_system.md
@@ -1,5 +1,6 @@
---
tags:
- - No Category
+ - Redirect
---
-1. REDIRECT [AFIS](afis.md)
\ No newline at end of file
+
+_See: [AFIS](afis.md)_
diff --git a/docs/big_endian.md b/docs/big_endian.md
index aee45318d..0dcff82b7 100644
--- a/docs/big_endian.md
+++ b/docs/big_endian.md
@@ -1,5 +1,6 @@
---
tags:
- - No Category
+ - Redirect
---
-1. REDIRECT [Endianness](endianness.md)
\ No newline at end of file
+
+_See: [Endianness](endianness.md)_
diff --git a/docs/datamining_for_foresnics.md b/docs/datamining_for_foresnics.md
index edb66d844..29bf361b3 100644
--- a/docs/datamining_for_foresnics.md
+++ b/docs/datamining_for_foresnics.md
@@ -1,6 +1,6 @@
---
tags:
- - No Category
+ - Redirect
---
-1. REDIRECT [Datamining for
- Forensics](datamining_for_forensics.md)
\ No newline at end of file
+
+_See: [Datamining for Forensics](datamining_for_forensics.md)_
diff --git a/docs/dban.md b/docs/dban.md
index 4436bbb5e..fb2217f54 100644
--- a/docs/dban.md
+++ b/docs/dban.md
@@ -1,5 +1,6 @@
---
tags:
- - No Category
+ - Redirect
---
-1. REDIRECT [Darik's Boot and Nuke](darik's_boot_and_nuke.md)
\ No newline at end of file
+
+_See: [Darik's Boot and Nuke](darik's_boot_and_nuke.md)_
diff --git a/docs/dc3.md b/docs/dc3.md
index e1005ed24..ae812e565 100644
--- a/docs/dc3.md
+++ b/docs/dc3.md
@@ -1,5 +1,6 @@
---
tags:
- - No Category
+ - Redirect
---
-1. REDIRECT [DoD Cyber Crime Center](dod_cyber_crime_center.md)
\ No newline at end of file
+
+_See: [DoD Cyber Crime Center](dod_cyber_crime_center.md)_
diff --git a/docs/dcfl.md b/docs/dcfl.md
index 8b9f084d9..76ea5048f 100644
--- a/docs/dcfl.md
+++ b/docs/dcfl.md
@@ -1,6 +1,6 @@
---
tags:
- - No Category
+ - Redirect
---
-1. REDIRECT [Defense Computer Forensics
- Lab](defense_computer_forensics_lab.md)
\ No newline at end of file
+
+_See: [Defense Computer Forensics Lab](defense_computer_forensics_lab.md)_
diff --git a/docs/defense_computer_investigations_training_academy.md b/docs/defense_computer_investigations_training_academy.md
index 50e4d9ea0..8a5617567 100644
--- a/docs/defense_computer_investigations_training_academy.md
+++ b/docs/defense_computer_investigations_training_academy.md
@@ -1,6 +1,6 @@
---
tags:
- - No Category
+ - Redirect
---
-1. REDIRECT [Defense Cyber Investigations Training
- Academy](defense_cyber_investigations_training_academy.md)
\ No newline at end of file
+
+_See: [Defense Cyber Investigations Training Academy](defense_cyber_investigations_training_academy.md)_
diff --git a/docs/defense_cyber_crime_center.md b/docs/defense_cyber_crime_center.md
index e1005ed24..ae812e565 100644
--- a/docs/defense_cyber_crime_center.md
+++ b/docs/defense_cyber_crime_center.md
@@ -1,5 +1,6 @@
---
tags:
- - No Category
+ - Redirect
---
-1. REDIRECT [DoD Cyber Crime Center](dod_cyber_crime_center.md)
\ No newline at end of file
+
+_See: [DoD Cyber Crime Center](dod_cyber_crime_center.md)_
diff --git a/docs/defense_cybercrime_center.md b/docs/defense_cybercrime_center.md
index e1005ed24..ae812e565 100644
--- a/docs/defense_cybercrime_center.md
+++ b/docs/defense_cybercrime_center.md
@@ -1,5 +1,6 @@
---
tags:
- - No Category
+ - Redirect
---
-1. REDIRECT [DoD Cyber Crime Center](dod_cyber_crime_center.md)
\ No newline at end of file
+
+_See: [DoD Cyber Crime Center](dod_cyber_crime_center.md)_
diff --git a/docs/digital_corpora.md b/docs/digital_corpora.md
index aebf9068a..c5806b654 100644
--- a/docs/digital_corpora.md
+++ b/docs/digital_corpora.md
@@ -1,5 +1,6 @@
---
tags:
- - No Category
+ - Redirect
---
-1. REDIRECT [Forensic corpora](forensic_corpora.md)
\ No newline at end of file
+
+_See: [Forensic corpora](forensic_corpora.md)_
diff --git a/docs/digital_forensics.md b/docs/digital_forensics.md
index f64ab22cb..cb91bcf7a 100644
--- a/docs/digital_forensics.md
+++ b/docs/digital_forensics.md
@@ -1,5 +1,6 @@
---
tags:
- - No Category
+ - Redirect
---
-1. REDIRECT [Computer forensics](computer_forensics.md)
\ No newline at end of file
+
+_See: [Computer forensics](computer_forensics.md)_
diff --git a/docs/digital_forensics_research_workshop.md b/docs/digital_forensics_research_workshop.md
index f1aefc790..7a88aab04 100644
--- a/docs/digital_forensics_research_workshop.md
+++ b/docs/digital_forensics_research_workshop.md
@@ -1,6 +1,6 @@
---
tags:
- - No Category
+ - Redirect
---
-1. REDIRECT [Digital Forensic Research
- Workshop](digital_forensic_research_workshop.md)
\ No newline at end of file
+
+_See: [Digital Forensic Research Workshop](digital_forensic_research_workshop.md)_
diff --git a/docs/digital_investigative_analysis.md b/docs/digital_investigative_analysis.md
index f64ab22cb..cb91bcf7a 100644
--- a/docs/digital_investigative_analysis.md
+++ b/docs/digital_investigative_analysis.md
@@ -1,5 +1,6 @@
---
tags:
- - No Category
+ - Redirect
---
-1. REDIRECT [Computer forensics](computer_forensics.md)
\ No newline at end of file
+
+_See: [Computer forensics](computer_forensics.md)_
diff --git a/docs/disk_images.md b/docs/disk_images.md
index e1c5b0362..4167b0ce5 100644
--- a/docs/disk_images.md
+++ b/docs/disk_images.md
@@ -38,8 +38,7 @@ Forensics File Formats
[Mac OS X](mac_os_x.md) has support for various disk image types
build-in, some of which are:
-* read-write disk image (.dmg): [raw](raw_image_format.md),
- [UDIF](http://newosxbook.com/DMG.html), NDIF
+* read-write disk image (.dmg): [raw](raw_image_format.md), [UDIF](dmg.md), NDIF
* [Sparse disk image (.spareimage)](https://github.com/libyal/libmodi/blob/main/documentation/Mac%20OS%20disk%20image%20types.asciidoc#3-sparse-disk-image-sparseimage-format)
* [Sparse bundle disk image (.sparsebundle)](https://github.com/libyal/libmodi/blob/main/documentation/Mac%20OS%20disk%20image%20types.asciidoc#4-sparse-bundle-disk-image-sparsebundle-format)
diff --git a/docs/dmg.md b/docs/dmg.md
index 887a1e410..a589db368 100644
--- a/docs/dmg.md
+++ b/docs/dmg.md
@@ -1,8 +1,8 @@
---
tags:
- - File Formats
- - MacOS
- - Disk Image
+ - Disk Image
+ - File Formats
+ - MacOS
---
**DMG** is the proprietary Apple Disk Image file recognized & primarily
associated with the Macintosh OS X operating system used for emulating a
@@ -135,12 +135,11 @@ file. The long-familiar licensed cross platform utilities are:
## External Links
-- [Demystifying the DMG File Format](http://newosxbook.com/DMG.html), by
- Jonathan Levin, June 2013
-- [Mac OS disk image
- types](https://github.com/libyal/libmodi/blob/main/documentation/Mac%20OS%20disk%20image%20types.asciidoc),
+* [Demystifying the DMG File Format](https://newosxbook.com/DMG.html),
+ by Jonathan Levin, June 2013
+* [Mac OS disk image types](https://github.com/libyal/libmodi/blob/main/documentation/Mac%20OS%20disk%20image%20types.asciidoc),
by the libmodi project
### Tools
-- [DMG Viewer](https://www.systoolsgroup.com/dmg-viewer/)
\ No newline at end of file
+* [DMG Viewer](https://www.systoolsgroup.com/dmg-viewer/)
diff --git a/docs/endianness.md b/docs/endianness.md
index 4dc426fae..7ebfe6108 100644
--- a/docs/endianness.md
+++ b/docs/endianness.md
@@ -1,6 +1,6 @@
---
tags:
- - Articles that need to be expanded
+ - Articles that need to be expanded
---
Endianness refers to the way that a computer processor or file format
stores numbers.
@@ -34,4 +34,4 @@ Network endian (big endian).
## External Links
-- [Wikipedia: Endianness](https://en.wikipedia.org/wiki/Endianness)
\ No newline at end of file
+* [Wikipedia: Endianness](https://en.wikipedia.org/wiki/Endianness)
diff --git a/docs/file_type_identification.md b/docs/file_type_identification.md
index b63a6f92e..9762c28cb 100644
--- a/docs/file_type_identification.md
+++ b/docs/file_type_identification.md
@@ -1,6 +1,6 @@
---
tags:
- - No Category
+ - Redirect
---
-1. REDIRECT [File Format
- Identification](file_format_identification.md)
\ No newline at end of file
+
+_See: [File Format Identification](file_format_identification.md)_
diff --git a/docs/forensic_training.md b/docs/forensic_training.md
index 34cb99289..18f850b6e 100644
--- a/docs/forensic_training.md
+++ b/docs/forensic_training.md
@@ -1,30 +1,6 @@
---
tags:
- - Training
+ - Redirect
---
-This page lists vendors that offer various kinds of forensic training.
-## Open for everyone
-
-* [AccessData Training](https://www.exterro.com)
-* [Armor Forensics (NTI - Forensics International)](http://www.forensics-intl.com/training.html)
-* [ASR Data Training](http://www.asrdata.com/training/)
-* [Certified Computer Examiner BootCamp](http://www.cce-bootcamp.com/)
-* [CPR Tools Training (Basic and Advanced Data Recovery)](https://www.cprtools.com/training/)
-* [Computer Forensics Training Center On-Line](http://www.cftco.com/)
-* [e-fense Inc](http://www.e-fense.com/training.html)
-* [FBI Screencast Training](http://www.nuix.com.au/screencasts.html)
-* [Guidance Software (EnCase) Training](http://www.guidancesoftware.com/training/index.aspx)
-* [InfoSec Institute](https://www.infosecinstitute.com/skills/content-library/)
-* [Linux Data Forensics Training](http://www.crazytrain.com/training.html)
-* [Maresware Training](http://www.maresware.com/maresware/training/maresware.htm)
-* [Paraben Forensics Training](https://paraben.com/dfir-training-3/)
-* [Vigilar](http://www.vigilar.com/training.html)
-* [NetSecurity Hands-On How-To Training Courses](http://netsecurity.com/forensics/digital_computer_forensics_training.html)
-
-## Law enforcement only
-
-* [Federal Law Enforcement Training Center](http://www.fletc.gov/cfi/fy06tibsched.htm)
-* [IACIS Computer Training/Certification](http://cops.org/)
-* [National White Collar Crime Center](https://www.nw3c.org/home)
-* [Search.Org](http://www.search.org/programs/hightech/courses.asp)
+_See: [Training courses and providers](training_courses_and_providers.md)_
diff --git a/docs/forensicator.md b/docs/forensicator.md
index fdd3a5446..6ad0a2005 100644
--- a/docs/forensicator.md
+++ b/docs/forensicator.md
@@ -1,5 +1,6 @@
---
tags:
- - No Category
+ - Redirect
---
-1. REDIRECT [Investigator](investigator.md)
\ No newline at end of file
+
+_See: [Investigator](investigator.md)_
diff --git a/docs/gsm.md b/docs/gsm.md
index 2ae13ded6..4d791cec1 100644
--- a/docs/gsm.md
+++ b/docs/gsm.md
@@ -1,6 +1,6 @@
---
tags:
- - No Category
+ - Redirect
---
-1. REDIRECT [Global System for Mobile
- Communications](global_system_for_mobile_communications.md)
\ No newline at end of file
+
+_See: [Global System for Mobile Communications](global_system_for_mobile_communications.md)_
diff --git a/docs/hiberfil.md b/docs/hiberfil.md
index 6af12924f..9cd5350a6 100644
--- a/docs/hiberfil.md
+++ b/docs/hiberfil.md
@@ -1,5 +1,6 @@
---
tags:
- - No Category
+ - Redirect
---
-1. REDIRECT [hiberfil.sys](hiberfil.sys.md)
\ No newline at end of file
+
+_See: [hiberfil.sys](hiberfil.sys.md)_
diff --git a/docs/how_to_setting_up_disk_imaging_station.md b/docs/how_to_setting_up_disk_imaging_station.md
index bf8c56bfb..902d7d6c3 100644
--- a/docs/how_to_setting_up_disk_imaging_station.md
+++ b/docs/how_to_setting_up_disk_imaging_station.md
@@ -1,6 +1,6 @@
---
tags:
- - No Category
+ - Redirect
---
-1. REDIRECT [How To Set Up a Disk Imaging
- Station](how_to_set_up_a_disk_imaging_station.md)
\ No newline at end of file
+
+_See: [How To Set Up a Disk Imaging Station](how_to_set_up_a_disk_imaging_station.md)_
diff --git a/docs/ilook_external_imager.md b/docs/ilook_external_imager.md
index 7e449c3eb..6265f93ae 100644
--- a/docs/ilook_external_imager.md
+++ b/docs/ilook_external_imager.md
@@ -1,5 +1,6 @@
---
tags:
- - No Category
+ - Redirect
---
-1. REDIRECT [IXimager](iximager.md)
\ No newline at end of file
+
+_See: [IXimager](iximager.md)_
diff --git a/docs/iximager.md b/docs/iximager.md
index 4c27c17c3..5d3b1c97f 100644
--- a/docs/iximager.md
+++ b/docs/iximager.md
@@ -1,10 +1,10 @@
---
tags:
- - No Category
+ - Articles that need to be expanded
+ - Tools
---
-The **IXimager** imager application is external to the
-[Windows](windows.md) [operating
-systems](operating_system.md).
+The **IXimager** imager application is external to the [Windows](windows.md)
+[operating systems](operating_system.md).
It is based on [Linux](linux.md) and is used in conjunction with
[ILook Investigator](ilook.md) to perform the specific tasks. The program can
diff --git a/docs/java.md b/docs/java.md
index 753f4034d..d14e99730 100644
--- a/docs/java.md
+++ b/docs/java.md
@@ -194,9 +194,3 @@ other) information.
by Tim Johnson, May 23, 2013
- [The State of Java Reversing Tools](https://www.ghettoforensics.com/2013/09/malware-analysis-state-of-java-analysis.html),
by Brian Baskin, September 3, 2013
-
-### Java source code
-
-- [Cache.java](http://jdk-source-code.googlecode.com/svn/trunk/jdk6u21_src/deploy/src/common/share/classes/com/sun/deploy/cache/Cache.java)
-- [CacheEntry.java](http://jdk-source-code.googlecode.com/svn/trunk/jdk6u21_src/deploy/src/common/share/classes/com/sun/deploy/cache/CacheEntry.java)
-
diff --git a/docs/linux_software_write_blocker.md b/docs/linux_software_write_blocker.md
index 343af1680..1725bd9c1 100644
--- a/docs/linux_software_write_blocker.md
+++ b/docs/linux_software_write_blocker.md
@@ -1,5 +1,6 @@
---
tags:
- - No Category
+ - Redirect
---
-1. REDIRECT [Linux write blocker](linux_write_blocker.md)
\ No newline at end of file
+
+_See: [Linux write blocker](linux_write_blocker.md)_
diff --git a/docs/liveview.md b/docs/liveview.md
index b10e48e58..1b89681cc 100644
--- a/docs/liveview.md
+++ b/docs/liveview.md
@@ -1,5 +1,6 @@
---
tags:
- - No Category
+ - Redirect
---
-1. REDIRECT [Live_view](live_view.md)
\ No newline at end of file
+
+_See: [Live_view](live_view.md)_
diff --git a/docs/mac_os_x.md b/docs/mac_os_x.md
index 8145c1601..22d78a7b8 100644
--- a/docs/mac_os_x.md
+++ b/docs/mac_os_x.md
@@ -254,16 +254,15 @@ Mac OS.
* [mac-security-tips](https://code.google.com/archive/p/mac-security-tips/wikis/ALL_THE_TIPS.wiki)
* [Hidden backdoor API to root privileges in Apple OS X](https://truesecdev.wordpress.com/2015/04/09/hidden-backdoor-api-to-root-privileges-in-apple-os-x/),
by Emil Kvarnhammar, April 9, 2015
-* [Max OS X Internals book (1st ed)](http://newosxbook.com/1stEdIsFree.html) by Jonathan Levin PDF
- download
+* [Max OS X Internals book (1st ed)](https://newosxbook.com/1stEdIsFree.html)
+ by Jonathan Levin
* [The Boot Loader](https://developer.apple.com/library/archive/documentation/Darwin/Conceptual/KernelProgramming/booting/booting.html),
by Apple
### Alias
-* [Reversing Mac Alias v3 Data
- Objects](http://survey-smiles.com), by
- Patrick Olsen, August 15, 2016
+* [Reversing Mac Alias v3 Data Objects](http://survey-smiles.com),
+ by Patrick Olsen, August 15, 2016
### Apple Examiner
diff --git a/docs/mbr.md b/docs/mbr.md
index 15fb3a330..3219b4e9f 100644
--- a/docs/mbr.md
+++ b/docs/mbr.md
@@ -1,5 +1,6 @@
---
tags:
- - No Category
+ - Redirect
---
-1. REDIRECT [Master boot record](master_boot_record.md)
\ No newline at end of file
+
+_See: [Master boot record](master_boot_record.md)_
diff --git a/docs/microsoft_office_file_format.md b/docs/microsoft_office_file_format.md
index f5d0055d1..b5b66b9ef 100644
--- a/docs/microsoft_office_file_format.md
+++ b/docs/microsoft_office_file_format.md
@@ -1,6 +1,6 @@
---
tags:
- - No Category
+ - Redirect
---
-1. REDIRECT [Microsoft Office File
- formats](microsoft_office_file_formats.md)
\ No newline at end of file
+
+_See: [Microsoft Office File formats](microsoft_office_file_formats.md)_
diff --git a/docs/sanitization_standards.md b/docs/sanitization_standards.md
index 1d662d83c..b17af59a4 100644
--- a/docs/sanitization_standards.md
+++ b/docs/sanitization_standards.md
@@ -34,7 +34,6 @@ regarding the disk sanitization problem:
### USA
-- [AFSSI-5020](http://jya.com/afssi5020.htm): USAF Data Sanitization Standard.
- [NIST 800-88](https://csrc.nist.gov/publications/detail/sp/800-88/rev-1/final):
Guidelines for Data Sanitation, Sept 2006.
- [DoD Destruction](http://simson.net/ref/2001/ASD_HD_Disposition_memo060401.pdf):
diff --git a/docs/timestomp.md b/docs/timestomp.md
index 8275ddb47..64b3eb653 100644
--- a/docs/timestomp.md
+++ b/docs/timestomp.md
@@ -1,8 +1,8 @@
---
tags:
- - Anti-Forensics
- - File Analysis
- - Articles that need to be expanded
+ - Anti-Forensics
+ - Articles that need to be expanded
+ - File Analysis
---
|
Amped Software (Image & Video forensics - FIVE; Authenticate) | |
ASR Data (SMART) | |
Cellebrite (UFED) | |
-CPR Tools (Data Recovery) | |
Digital Intelligence (FRED Forensics Platform) | |
e-fense, Inc. (Helix3 Pro) | |
ElcomSoft Co.Ltd. (desktop, mobile and cloud forensics) | |
@@ -69,7 +60,7 @@ OpenText (Guidance Software) (EnCase) | |
Nuix (eDiscovery) | |
MailXaminer (Email Forensics Tool) | |
-Paraben (Paraben Suite) | |
+Paraben (Paraben Suite) | |
Software Analysis & Forensic Engineering (CodeSuite) | |
Sumuri, LLC. (Recon for MAC OS X) | |
Volatility Labs (Volatility Framework) | |
@@ -81,7 +72,7 @@ Title | Website | Limitation
--- | --- | ---
BerlaCorp Vehicle System Forensics Training Program | |
Computer Forensic Training Center Online (CFTCO) | |
-CCE Bootcamp | |
+CCE Bootcamp | |
Cyber Security Academy | |
Dera Forensics Group | |
e-fense Training | |
@@ -92,7 +83,6 @@ Infosec Institute | |
Intense School (a subsidiary of Infosec Institute) | |
MD5 Group (Computer Forensics and E-Discovery courses)(Dallas, TX) | |
Mile 2 (Security and Forensics Certification Training) | |
-Mobile Forensics, Inc | |
NetSecurity | |
NTI (an Armor Forensics Company) APPEARS DEFUNCT | |
Security University | |
@@ -101,3 +91,7 @@ SysAdmin, Audit, Network, Security Institute (SANS) | |
Teel Technologies Mobile Device Forensics Training | |
Zeidman Consulting (MCLE) | |
+
+## Other
+
+* [Maresware Training](https://www.maresware.com/maresware/training/maresware.htm)