diff --git a/docs/APIReference-Data-Conversion.md b/docs/APIReference-Data-Conversion.md
index 02778a25b4..04f5d8bdec 100644
--- a/docs/APIReference-Data-Conversion.md
+++ b/docs/APIReference-Data-Conversion.md
@@ -29,10 +29,10 @@ objects.
 ### convertFromRaw
 
 ```
-convertFromRaw(rawState: RawDraftContentState): Array<ContentBlock>
+convertFromRaw(rawState: RawDraftContentState): ContentState
 ```
 
-Given a raw state, convert it to an array of `ContentBlock` objects. This is useful when
+Given a raw state, convert it to a `ContentState`. This is useful when
 restoring contents to use within a Draft editor.
 
 ### convertToRaw
@@ -49,7 +49,7 @@ other usage within an application.
 ### convertFromHTML
 
 ```
-convertFromHTML(html: string): Array<ContentBlock>
+convertFromHTML(html: string): ?Array<ContentBlock>
 ```
 
-Given an HTML fragment, convert it to an array of `ContentBlock` objects. 
+Given an HTML fragment, convert it to an array of `ContentBlock` objects.
diff --git a/website/core/metadata.js b/website/core/metadata.js
index 3b20e05eda..eb3b7b1d06 100644
--- a/website/core/metadata.js
+++ b/website/core/metadata.js
@@ -84,6 +84,14 @@ module.exports = {
       "next": "advanced-topics-issues-and-pitfalls",
       "permalink": "docs/advanced-topics-text-direction.html"
     },
+    {
+      "id": "api-reference-atomic-block-utils",
+      "title": "AtomicBlockUtils",
+      "layout": "docs",
+      "category": "API Reference",
+      "next": "api-reference-key-binding-util",
+      "permalink": "docs/api-reference-atomic-block-utils.html"
+    },
     {
       "id": "api-reference-character-metadata",
       "title": "CharacterMetadata",
@@ -92,6 +100,14 @@ module.exports = {
       "next": "api-reference-entity",
       "permalink": "docs/api-reference-character-metadata.html"
     },
+    {
+      "id": "api-reference-composite-decorator",
+      "title": "CompositeDecorator",
+      "layout": "docs",
+      "category": "API Reference",
+      "next": "api-reference-data-conversion",
+      "permalink": "docs/api-reference-composite-decorator.html"
+    },
     {
       "id": "api-reference-content-block",
       "title": "ContentBlock",
@@ -148,6 +164,14 @@ module.exports = {
       "next": "api-reference-selection-state",
       "permalink": "docs/api-reference-entity.html"
     },
+    {
+      "id": "api-reference-key-binding-util",
+      "title": "KeyBindingUtil",
+      "layout": "docs",
+      "category": "API Reference",
+      "next": "api-reference-modifier",
+      "permalink": "docs/api-reference-key-binding-util.html"
+    },
     {
       "id": "api-reference-modifier",
       "title": "Modifier",
@@ -160,7 +184,7 @@ module.exports = {
       "title": "RichUtils",
       "layout": "docs",
       "category": "API Reference",
-      "next": "api-reference-modifier",
+      "next": "api-reference-atomic-block-utils",
       "permalink": "docs/api-reference-rich-utils.html"
     },
     {
@@ -168,7 +192,7 @@ module.exports = {
       "title": "SelectionState",
       "layout": "docs",
       "category": "API Reference",
-      "next": "api-reference-data-conversion",
+      "next": "api-reference-composite-decorator",
       "permalink": "docs/api-reference-selection-state.html"
     },
     {