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 000000000..c6e0a58e6 Binary files /dev/null and b/docs/media/misc/netbox_logo.png differ 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" 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'