Merge "Correct broken links"
diff --git a/docs/conf.py b/docs/conf.py
index c680572..0c79cc9 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -1,6 +1,6 @@
 from docs_conf.conf import *
 
-branch = 'guilin'
+branch = 'latest'
 doc_url = 'https://docs.onap.org/projects'
 master_doc = 'index'
 
diff --git a/docs/guides/onap-developer/how-to-use-docs/index.rst b/docs/guides/onap-developer/how-to-use-docs/index.rst
index 787b8c1..799574d 100644
--- a/docs/guides/onap-developer/how-to-use-docs/index.rst
+++ b/docs/guides/onap-developer/how-to-use-docs/index.rst
@@ -8,8 +8,8 @@
    :maxdepth: 2
 
    introduction
-   setting-up-environment
    setting-up
+   setting-up-environment
    style-guide
    api-swagger-guide
    converting-to-rst
diff --git a/docs/guides/onap-developer/how-to-use-docs/style-guide.rst b/docs/guides/onap-developer/how-to-use-docs/style-guide.rst
index dcd1552..17dee9f 100644
--- a/docs/guides/onap-developer/how-to-use-docs/style-guide.rst
+++ b/docs/guides/onap-developer/how-to-use-docs/style-guide.rst
@@ -43,8 +43,8 @@
    +  Examples: an MSO component, a LAN, an L3-VPN
 
 
-ONAP terms
-^^^^^^^^^^
+ONAP terminology
+^^^^^^^^^^^^^^^^
 -  AA&I vs AAI: AAI should be used.
 
 -  APP-C vs APPC: APPC should be used.