diff --git a/doc/source/contributor/encrypt_vim_auth_with_barbican.rst b/doc/source/contributor/encrypt_vim_auth_with_barbican.rst
index 89ecab831..9cac81925 100644
--- a/doc/source/contributor/encrypt_vim_auth_with_barbican.rst
+++ b/doc/source/contributor/encrypt_vim_auth_with_barbican.rst
@@ -1,5 +1,6 @@
-Barbican Guide
-==============
+Save VIM credentials into Barbican
+==================================
+
 Overview
 --------
 
diff --git a/doc/source/index.rst b/doc/source/index.rst
index feeb5419c..c876076a5 100644
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -57,6 +57,7 @@ Feature Documentation
    contributor/tacker_conductor.rst
    contributor/tacker_vim_monitoring.rst
    contributor/policy_actions_framework.rst
+   contributor/encrypt_vim_auth_with_barbican.rst
 
 User Guide
 ==========
diff --git a/doc/source/user/vnffg_usage_guide.rst b/doc/source/user/vnffg_usage_guide.rst
index ba4aa7f18..6c45da645 100644
--- a/doc/source/user/vnffg_usage_guide.rst
+++ b/doc/source/user/vnffg_usage_guide.rst
@@ -11,7 +11,7 @@
   License for the specific language governing permissions and limitations
   under the License.
 
-.. _ref-scale:
+.. _ref-vnffg:
 
 ====================
 VNF Forwarding Graph
diff --git a/tacker/api/extensions.py b/tacker/api/extensions.py
index d2c9971bb..3f0e36b1f 100644
--- a/tacker/api/extensions.py
+++ b/tacker/api/extensions.py
@@ -452,7 +452,7 @@ class ExtensionManager(object):
         """Extend resources with additional resources or attributes.
 
         :param attr_map: the existing mapping from resource name to
-        attrs definition.
+                         attrs definition.
 
         After this function, we will extend the attr_map if an extension
         wants to extend this map.