[898-add-a-new-hook-to-support-bootp] Resolved pull errors

diff --git a/doc/sphinx/arm/hooks-bootp.rst b/doc/sphinx/arm/hooks-bootp.rst
index 8c7d803170091f0a3b60fa6e0973dccd5f2bf572..b687d6c003d5d0f4cfbee28c2f8af643eae1f2e9 100644 (file)
--- a/doc/sphinx/arm/hooks-bootp.rst
+++ b/doc/sphinx/arm/hooks-bootp.rst
@@ -1,4 +1,4 @@
-.. _bootp-library:
+.. _hooks-bootp:
 
 BOOTP support
 =============

diff --git a/doc/sphinx/conf.py b/doc/sphinx/conf.py
index ae8f000a0ca7ab70d4e2e24c2ae0e013b605f4e3..abe7a3aca93f1a23104647be4561f0f7570f4602 100644 (file)
--- a/doc/sphinx/conf.py
+++ b/doc/sphinx/conf.py
@@ -81,7 +81,6 @@ exclude_patterns = [
     'arm/hooks-ha.rst',
     'arm/hooks-host-cache.rst',
     'arm/hooks-lease-cmds.rst',
-    'arm/hooks-bootp.rst',
     'arm/hooks-radius.rst',
     'arm/hooks-stat-cmds.rst',
     'arm/hammer.rst',