diff --git a/api-guide/source/general_info.rst b/api-guide/source/general_info.rst
index 405f7743e564..6d7b87e187ba 100644
--- a/api-guide/source/general_info.rst
+++ b/api-guide/source/general_info.rst
@@ -247,7 +247,8 @@ on compute hosts rather than servers.
 
 -  **Certificates**
 
-   TODO
+   Nova service "nova-cert" handles the management of X509 certificates which
+   are used to generate certificates for euca-bundle-image.
 
 Relationship with Volume API
 =============================