From 1afac47178dfd0a32de384ef3dec3796a428fbdd Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@netboxlabs.com>
Date: Tue, 5 Dec 2023 08:05:44 -0500
Subject: [PATCH] Documentation cleanup

---
 docs/introduction.md            |   8 ++++++--
 docs/media/misc/netbox_logo.png | Bin 0 -> 3903 bytes
 docs/reference/markdown.md      |   8 ++++----
 mkdocs.yml                      |   5 +++--
 4 files changed, 13 insertions(+), 8 deletions(-)
 create mode 100644 docs/media/misc/netbox_logo.png

diff --git a/docs/introduction.md b/docs/introduction.md
index 8f62d842a..b8442dad7 100644
--- a/docs/introduction.md
+++ b/docs/introduction.md
@@ -19,10 +19,13 @@ NetBox was built specifically to serve the needs of network engineers and operat
 * Device modeling using pre-defined types
 * Virtual chassis and device contexts
 * Network, power, and console cabling with SVG traces
+* Breakout cables
 * Power distribution modeling
 * Data circuit and provider tracking
 * Wireless LAN and point-to-point links
-* L2 VPN overlays
+* VPN tunnels
+* IKE & IPSec policies
+* Layer 2 VPN overlays
 * FHRP groups (VRRP, HSRP, etc.)
 * Application service bindings
 * Virtual machines & clusters
@@ -30,13 +33,14 @@ NetBox was built specifically to serve the needs of network engineers and operat
 * Tenant ownership assignment
 * Device & VM configuration contexts for advanced configuration rendering
 * Custom fields for data model extension
-* Custom validation rules
+* Custom validation & protection rules
 * Custom reports & scripts executable directly within the UI
 * Extensive plugin framework for adding custom functionality
 * Single sign-on (SSO) authentication
 * Robust object-based permissions
 * Detailed, automatic change logging
 * Global search engine
+* Event-driven scripts & webhooks
 
 ## What NetBox Is Not
 
diff --git a/docs/media/misc/netbox_logo.png b/docs/media/misc/netbox_logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..c6e0a58e6259f957f2427afe1035e8e37a6d713c
GIT binary patch
literal 3903
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
N002ovPDHLkV1j7+9Wwv`

literal 0
HcmV?d00001

diff --git a/docs/reference/markdown.md b/docs/reference/markdown.md
index 7f280686d..0759fa2ec 100644
--- a/docs/reference/markdown.md
+++ b/docs/reference/markdown.md
@@ -171,23 +171,23 @@ Some text to show that the reference links can follow later.
 Here's the NetBox logo (hover to see the title text):
 
 Inline-style: 
-![alt text](/static/netbox_logo.png "Logo Title Text 1")
+![alt text](/media/misc/netbox_logo.png "Logo Title Text 1")
 
 Reference-style: 
 ![alt text][logo]
 
-[logo]: /static/netbox_logo.png "Logo Title Text 2"
+[logo]: /media/misc/netbox_logo.png "Logo Title Text 2"
 ```
 
 Here's the NetBox logo (hover to see the title text):
 
 Inline-style: 
-![alt text](/static/netbox_logo.png "Logo Title Text 1")
+![alt text](../media/misc/netbox_logo.png "Logo Title Text 1")
 
 Reference-style: 
 ![alt text][logo]
 
-[logo]: /static/netbox_logo.png "Logo Title Text 2"
+[logo]: ../media/misc/netbox_logo.png "Logo Title Text 2"
 
 <a name="code"></a>
 
diff --git a/mkdocs.yml b/mkdocs.yml
index 45f9fe7d1..5a7e00c2c 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -53,8 +53,8 @@ markdown_extensions:
     - admonition
     - attr_list
     - pymdownx.emoji:
-        emoji_index: !!python/name:materialx.emoji.twemoji
-        emoji_generator: !!python/name:materialx.emoji.to_svg
+        emoji_index: !!python/name:material.extensions.emoji.twemoji
+        emoji_generator: !!python/name:material.extensions.emoji.to_svg
     - pymdownx.superfences:
         custom_fences:
           - name: mermaid
@@ -263,6 +263,7 @@ nav:
             - L2VPN: 'models/vpn/l2vpn.md'
             - L2VPNTermination: 'models/vpn/l2vpntermination.md'
             - Tunnel: 'models/vpn/tunnel.md'
+            - TunnelGroup: 'models/vpn/tunnelgroup.md'
             - TunnelTermination: 'models/vpn/tunneltermination.md'
         - Wireless:
             - WirelessLAN: 'models/wireless/wirelesslan.md'