diff --git a/testing/mozbase/docs/index.rst b/testing/mozbase/docs/index.rst
index 7f927c5763f3..4da0c24c23c1 100644
--- a/testing/mozbase/docs/index.rst
+++ b/testing/mozbase/docs/index.rst
@@ -39,7 +39,7 @@ want to do then dive in!
    manifestparser
    gettinginfo
    setuprunning
-   mozhttpd
+   servingcontent
    loggingreporting
    devicemanagement
 
diff --git a/testing/mozbase/docs/mozhttpd.rst b/testing/mozbase/docs/mozhttpd.rst
index f6ceddb37045..172744e60388 100644
--- a/testing/mozbase/docs/mozhttpd.rst
+++ b/testing/mozbase/docs/mozhttpd.rst
@@ -1,6 +1,6 @@
 
-Serving up content to be consumed by the browser
-================================================
+:mod:`mozhttpd` --- Serving up content to be consumed by the browser
+====================================================================
 
 
 .. warning:: The mozhttpd module is considered obsolete. For new code,
diff --git a/testing/mozbase/docs/servingcontent.rst b/testing/mozbase/docs/servingcontent.rst
new file mode 100644
index 000000000000..599f460dcbeb
--- /dev/null
+++ b/testing/mozbase/docs/servingcontent.rst
@@ -0,0 +1,11 @@
+Handling content for the browser
+==============================
+
+It's often necessary to handle data for the browser. This can be accomplished
+by using a local webserver or by setting up a proxy.
+
+.. toctree::
+   :maxdepth: 2
+
+   mozhttpd
+   mozproxy