diff --git a/doc/source/admin/components.rst b/doc/source/admin/components.rst
index d6b0984..fa72c66 100644
--- a/doc/source/admin/components.rst
+++ b/doc/source/admin/components.rst
@@ -71,7 +71,7 @@
    [zookeeper]
    hosts=zk1.example.com,zk2.example.com,zk3.example.com
 
-   [webapp]
+   [web]
    status_url=https://zuul.example.com/status
 
    [scheduler]
@@ -234,6 +234,15 @@
 
       An openssl file containing the server private key in PEM format.
 
+.. attr:: web
+
+   .. attr:: status_url
+
+      URL that will be posted in Zuul comments made to changes when
+      starting jobs for a change.
+
+      .. TODO: is this effectively required?
+
 .. attr:: webapp
 
    .. attr:: listen_address
@@ -251,13 +260,6 @@
 
       Zuul will cache the status.json file for this many seconds.
 
-   .. attr:: status_url
-
-      URL that will be posted in Zuul comments made to changes when
-      starting jobs for a change.
-
-      .. TODO: is this effectively required?
-
 .. attr:: scheduler
 
    .. attr:: command_socket
diff --git a/doc/source/admin/drivers/github.rst b/doc/source/admin/drivers/github.rst
index 4f46af6..83ac77f 100644
--- a/doc/source/admin/drivers/github.rst
+++ b/doc/source/admin/drivers/github.rst
@@ -317,10 +317,10 @@
       reporter should set as the commit status on github.
 
    .. TODO support role markup in :default: so we can xref
-      :attr:`webapp.status_url` below
+      :attr:`web.status_url` below
 
    .. attr:: status-url
-      :default: webapp.status_url or the empty string
+      :default: web.status_url or the empty string
 
       String value for a link url to set in the github
       status. Defaults to the zuul server status_url, or the empty