From aaec253e45982a4f6fdecb89e7bc6c09fb55829d Mon Sep 17 00:00:00 2001
From: trimstray
Date: Fri, 17 May 2019 09:45:55 +0200
Subject: [PATCH] merge 'Videos/Presentations' and 'Blogs/Podcasts/Videos' -
signed-off-by: trimstray
---
README.md | 41 +++++++++++++++++++----------------------
1 file changed, 19 insertions(+), 22 deletions(-)
diff --git a/README.md b/README.md
index fbd9437..f6c5ed4 100644
--- a/README.md
+++ b/README.md
@@ -75,7 +75,6 @@ Only main chapters:
- **[Systems/Services](#systemsservices-toc)**
- **[Networks](#networks-toc)**
- **[Manuals/Howtos/Tutorials](#manualshowtostutorials-toc)**
-- **[Videos/Presentations](#videospresentations-toc)**
- **[Inspiring Lists](#inspiring-lists-toc)**
- **[Blogs/Podcasts/Videos](#blogspodcastsvideos-toc)**
- **[Hacking/Penetration Testing](#hackingpenetration-testing-toc)**
@@ -766,27 +765,6 @@ performance of any of your sites from across the globe.
:small_orange_diamond: Let's Build a Simple Database - writing a sqlite clone from scratch in C.
-#### Videos/Presentations [[TOC]](#anger-table-of-contents)
-
-##### :black_small_square: SysOps/DevOps
-
-
- :small_orange_diamond: Varnish for PHP developers - very interesting presentation of varnish by Mattias Geniar.
- :small_orange_diamond: A Netflix Guide to Microservices - Josh Evans talks about the chaotic and vibrant world of microservices at Netflix.
-
-
-##### :black_small_square: Developers
-
-
- :small_orange_diamond: Comparing C to machine language - compare a simple C program with the compiled machine code of that program.
-
-
-##### :black_small_square: Other
-
-
- :small_orange_diamond: Diffie-Hellman Key Exchange (short version) - how Diffie-Hellman Key Exchange worked.
-
-
#### Inspiring Lists [[TOC]](#anger-table-of-contents)
##### :black_small_square: SysOps/DevOps
@@ -841,6 +819,19 @@ performance of any of your sites from across the globe.
#### Blogs/Podcasts/Videos [[TOC]](#anger-table-of-contents)
+##### :black_small_square: SysOps/DevOps
+
+
+ :small_orange_diamond: Varnish for PHP developers - very interesting presentation of varnish by Mattias Geniar.
+ :small_orange_diamond: A Netflix Guide to Microservices - Josh Evans talks about the chaotic and vibrant world of microservices at Netflix.
+
+
+##### :black_small_square: Developers
+
+
+ :small_orange_diamond: Comparing C to machine language - compare a simple C program with the compiled machine code of that program.
+
+
##### :black_small_square: Geeky Persons
@@ -938,6 +929,12 @@ CyberTalks - talks, interviews, and article about cybersecurity.
:small_orange_diamond: How to Do Things at ARL - how to configure modems, scan images, record CD-ROMs, and other useful techniques.
+##### :black_small_square: Other
+
+
+ :small_orange_diamond: Diffie-Hellman Key Exchange (short version) - how Diffie-Hellman Key Exchange worked.
+
+
#### Hacking/Penetration Testing [[TOC]](#anger-table-of-contents)
##### :black_small_square: Pentesters arsenal tools