diff --git a/api-guide/source/extra_specs_and_properties.rst b/api-guide/source/extra_specs_and_properties.rst
new file mode 100644
index 000000000000..29a9ffe942f2
--- /dev/null
+++ b/api-guide/source/extra_specs_and_properties.rst
@@ -0,0 +1,17 @@
+=======================================
+Flavor Extra Specs and Image Properties
+=======================================
+
+TODO: Generic description about Flavor Extra Specs and Image Properties.
+
+Flavor Extra Specs
+==================
+
+TODO: List the extra specs which we supported at here. The best is the extra
+specs can auto-gen from the nova code.
+
+Image Properties
+================
+
+TODO: List the properties which affect the server creation. The best is the
+properties can auto-gen from the image properties object.
diff --git a/api-guide/source/general_info.rst b/api-guide/source/general_info.rst
index 6bc6544fdf96..f2ace114097d 100644
--- a/api-guide/source/general_info.rst
+++ b/api-guide/source/general_info.rst
@@ -39,6 +39,11 @@ several key concepts:
    unique combination of disk space, memory capacity and priority for
    CPU time.
 
+-  **Flavor Extra Specs**
+
+   TODO: Short description at here. The detail reference to
+   :doc:`extra_specs_and_properties`
+
 -  **Image**
 
    A collection of files used to create or rebuild a server. Operators
@@ -48,6 +53,11 @@ several key concepts:
    server images if you plan to deploy a particular server configuration
    frequently.
 
+-  **Image Properties**
+
+   TODO: Short description at here. The detail reference to
+   :doc:`extra_specs_and_properties`
+
 -  **Key Pair**
 
    An ssh or x509 keypair that can be injected into a server. This allows you