Merge branch 'develop-2.8' into 2328-external-authentication

docs/configuration/index.md

@@ -4,6 +4,8 @@ NetBox's local configuration is stored in `netbox/netbox/configuration.py`. An e
 
 While NetBox has many configuration settings, only a few of them must be defined at the time of installation.
 
+## Configuration Parameters
+
 * [Required settings](required-settings.md)
 * [Optional settings](optional-settings.md)
 

docs/configuration/optional-settings.md

@@ -98,6 +98,14 @@ This parameter serves as a safeguard to prevent some potentially dangerous behav
 
 ---
 
+## DOCS_ROOT
+
+Default: `$INSTALL_DIR/docs/`
+
+The file path to NetBox's documentation. This is used when presenting context-sensitive documentation in the web UI. by default, this will be the `docs/` directory within the root NetBox installation path. (Set this to `None` to disable the embedded documentation.)
+
+---
+
 ## EMAIL
 
 In order to send email, NetBox needs an email server configured. The following items can be defined within the `EMAIL` setting:
@@ -183,6 +191,14 @@ LOGGING = {
 }
 ```
 
+### Available Loggers
+
+* `netbox.auth.*` - Authentication events
+* `netbox.api.views.*` - Views which handle business logic for the REST API
+* `netbox.reports.*` - Report execution (`module.name`)
+* `netbox.scripts.*` - Custom script execution (`module.name`)
+* `netbox.views.*` - Views which handle business logic for the web UI
+
 ---
 
 ## LOGIN_REQUIRED