Merge branch 'dev' of github.com:project-sunbird/project-sunbird.gith…

…ub.io into dev

_includes/sidebar.html

@@ -435,10 +435,10 @@ <h4 class="sidebar-group-title">Contribute to Sunbird</h4>
                     <a href="contributions/contribution_guidelines/">Contributing to Sunbird Documentation</a>
                 </li>
             </ul>
-             <a href="release_notes/">
+            <a href="release_notes/">
                 <h4 class="sidebar-group-title">Release Notes</h4>
             </a> 
-	   <a href="faqs/">
+	   		<a href="faqs/">
                 <h4 class="sidebar-group-title">Frequently asked questions</h4>
             </a>
             <ul class="sidebar-group faqs">

pages/developer-docs/how-to-guide/how_to_create_framework_in_sunbird.md

@@ -10,17 +10,31 @@ allowSearch: true
 ---
 ## Scenario
 
-Sunbird enables seamless access and discoverability of content through a [taxonomy framework](http://www.sunbird.org/faqs/taxonomymetadataframework/). The objective and intent of the framework is to ensure that content creators have an easy interface to tag content appropriately such that when a user search for content, they get relevant results. The framework consists of categories and terms within a specific domain. Terms are values for Categories. You can extend the core taxonomy via framework. The separation of the taxonomy from its extension in the form of framework(s) provides experts and pedagogues the power and flexibility to model and tag the content.
+The global knowledge model that is devoid of curricular leanings is Taxonomy and the curricular knowledge model as an extension of the taxonomy called as the Framework. It is important to understand that the taxonomy and framework both describe the same domain, and framework extends the knowledge model of a taxonomy. An intent of creating a framework is to enable organizations to organize their content in a structure which is easily discoverable and browsed by its users. Its main objective is to ensure that content creators have an easy interface to tag content (generate metadata) appropriately such that when a user search for content, they get relevant results. The separation of the taxonomy from its extension in the form of framework(s) provides experts and pedagogues the power and flexibility to model and tag the content. The framework consists of categories and terms within a specific domain.
 
-An organization can use existing framework term and concepts and link them to their own framework. While creating a new framework, the framework creator needs to set up a new framework and align it to the categories and terms. A category can have terms either in sequential list or in hierarchical structure. Terms can be associated with other terms across categories. As a result, it is possible to select a term in the first category and hence restrict the set of available terms for the next category and so on. The organizations that are adopting Sunbird can link the categories and also change the labels but cannot override or add a new categories on their own. However, the Sunbird instance will have the following categories in its predefined frameworks:
+Sunbird enables seamless access and discoverability of content through a taxonomy of the framework. An organization can use existing framework categories (concepts) and terms (specifications) and further link them to their own framework.
+
+Let us consider an example of an organization, Neerdhara, which works in the domain of water conservation and works with multiple NGOs, village panchayats, and district administration authorities in multiple states of India. They now need to create the framework for water management.  Framework will have relevant terms associated with the categories specific to the domain. The following example depicts the categories and terms specifically used for water management framework:
+
+Framework Name | Categories | Terms
+---------------|------------|-------
+Neerdhara      |Resources   |Ground Water, Spring, Surface Water
+               |Governance  |Ground water, Spring, Surface water
+               |Measurement & Mapping| Ground Water, Spring, Surface Water
+               |Funds       |
+               |Management  | Ground water, Spring, Surface water
+
+Neerdhara, may choose a predefined category and associate it to their own framework. The categories in the framework has terms associated with it. These terms are relevant to the created framework and can be created by the organization. 
+
+While creating a new framework, the framework creator needs to set up a new framework and align it to the categories and terms. A category can have terms either in sequential list or in hierarchical structure. Terms can be associated with other terms across categories. As a result, it is possible to select a term in the first category and hence restrict the set of available terms for the next category and so on. The organizations that are adopting Sunbird can link the categories and also change the labels but cannot override or add a new categories on their own. However, the Sunbird instance will have the following categories in its predefined frameworks:
 
     - Subject: classification of stream specific values
     - Board: certifying body/stream government or private organization
     - Grade Level: maturity level for knowledge  
     - Medium: language of the course 
     - Topic: detail of the concepts 
 
-A user can select one or more category amongst the defined category. Let us consider an example of an organization, Neerdhara, which works in the domain of water conservation and works with multiple NGOs, village panchayats, and district administration authorities in multiple states of India. They now need to create the framework for water management.  The organization may choose a predefined category and associate it to their own framework. The categories in the framework has terms associated with it. These terms are relevant to the created framework and can be created by the organization.  
+A user can select one or more category amongst the defined category. 
 
 For example, for the organization Neerdhara the framework name is Neerdhara and code as ndf1; the category selected is subject and change the label as Resource type which defines the various water resources and contains the terms as Rain water, lake, ponds and so on. 
 
@@ -82,11 +96,11 @@ Type: defines the type of content
     "result": {
         "framework": {
             "identifier": "ndf1",
-            "code": "ndf1",
+            "code": "ndf",
             "translations": "{\"hi\":\"एनसीएफ-अनुवाद\",\"ta\":\"NCF மொழிபெயர்ப்பு\"}",
             "name": "Neerdhara",
             "description": "Framework for Neerdhara Management",
-            "type": "TPD",
+            "type": "",
             "objectType": "Framework"
             }
         }
@@ -119,7 +133,7 @@ The sample values provided in the request body are indicative. The API describes
     {
         "responseCode": "OK",
         "result": {
-            "node_id": "ndf1_subject",
+            "node_id": "ndf_subject",
             "versionKey": "1535716551605"
             }
     }