From 67e470786f81fafcccceed2bf5c1a413b580877b Mon Sep 17 00:00:00 2001
From: ggetz <ggetz881@gmail.com>
Date: Wed, 29 Nov 2017 13:41:55 -0500
Subject: [PATCH 1/2] Added experimental jsdoc tag

---
 Tools/jsdoc/cesiumTags.js                      | 10 ++++++++++
 .../static/styles/jsdoc-default.css            | 18 ++++++++++++++++--
 Tools/jsdoc/cesium_template/tmpl/details.tmpl  |  9 +++++++++
 3 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/Tools/jsdoc/cesiumTags.js b/Tools/jsdoc/cesiumTags.js
index 4ce09ecd02b7..cc11c2cb5628 100644
--- a/Tools/jsdoc/cesiumTags.js
+++ b/Tools/jsdoc/cesiumTags.js
@@ -27,4 +27,14 @@ exports.defineTags = function(dictionary) {
             doclet.demo.push(tag.value);
         }
     });
+
+    dictionary.defineTag('experimental', {
+        mustHaveValue : true,
+        onTagged : function(doclet, tag) {
+            if (!doclet.experimental) {
+                doclet.experimental = [];
+            }
+            doclet.experimental.push(tag.value);
+        }
+    });
 };
diff --git a/Tools/jsdoc/cesium_template/static/styles/jsdoc-default.css b/Tools/jsdoc/cesium_template/static/styles/jsdoc-default.css
index abce268cff35..597e9a38aa9f 100644
--- a/Tools/jsdoc/cesium_template/static/styles/jsdoc-default.css
+++ b/Tools/jsdoc/cesium_template/static/styles/jsdoc-default.css
@@ -165,7 +165,7 @@ div.menu
     height: 35px;
 }
 
-div.nav 
+div.nav
 {
     overflow-x: hidden;
     overflow-y: auto;
@@ -211,7 +211,7 @@ div.nav div.divider
     line-height: 1.0em;
 }
 
-form 
+form
 {
     display: block;
 }
@@ -601,3 +601,17 @@ h4 .doc-link {
 h4:hover .doc-link {
     opacity: 0.7;
 }
+
+div.tag-experimental {
+    margin-left: -10px;
+    padding: 10px;
+    background-color: #ffd4a8;
+    color: #925415;
+}
+div.tag-experimental > h5 {
+    font-weight: bold;
+    margin-top: 0;
+}
+div.tag-experimental > p {
+    margin: 0 0 5px;
+}
diff --git a/Tools/jsdoc/cesium_template/tmpl/details.tmpl b/Tools/jsdoc/cesium_template/tmpl/details.tmpl
index 5d3b66cea9fc..ef8a61b0c115 100644
--- a/Tools/jsdoc/cesium_template/tmpl/details.tmpl
+++ b/Tools/jsdoc/cesium_template/tmpl/details.tmpl
@@ -81,6 +81,15 @@ var self = this;
     <?js }); ?></ul>
     <?js } ?>
 
+    <?js if (data.experimental && experimental.length) { ?>
+    <div class="tag-experimental">
+        <h5>Experimental</h5>
+        <?js experimental.forEach(function(e) { ?>
+            <p><?js= e ?></p>
+        <?js }); ?>
+    </div>
+    <?js } ?>
+
     <?js if (data.see && see.length) {?>
     <h5>See:</h5>
     <ul class="see-list"><?js see.forEach(function(s) { ?>

From 94a4ea81c655008cbdb32093b735803d1dc002d8 Mon Sep 17 00:00:00 2001
From: ggetz <ggetz881@gmail.com>
Date: Wed, 29 Nov 2017 17:25:27 -0500
Subject: [PATCH 2/2] Update CHANGES.md and Coding Guide

---
 CHANGES.md                                       | 1 +
 Documentation/Contributors/CodingGuide/README.md | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index d294ab3037f5..f7bf25050087 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -11,6 +11,7 @@ Change Log
 * Fixed bug in KMLDataSource.js (`processLookAt` function). Degrees and radians were mixing in a subtraction. [#5992](https://github.com/AnalyticalGraphicsInc/cesium/issues/5992)
 * Fixed handling of KMZ files with missing `xsi` namespace declarations. [#6003](https://github.com/AnalyticalGraphicsInc/cesium/pull/6003)
 * Fixed a bug where models with animations of different lengths would cause an error. [#5694](https://github.com/AnalyticalGraphicsInc/cesium/issues/5694)
+* Added a new `@experimental` tag to the documentation. A small subset of the API tagged as such are subject to breaking changes without deprecation. See the [Coding Guide](https://github.com/AnalyticalGraphicsInc/cesium/tree/master/Documentation/Contributors/CodingGuide#deprecation-and-breaking-changes) for further explanation. [#6010](https://github.com/AnalyticalGraphicsInc/cesium/pull/6010)
 * Added a `clampAnimations` parameter to `Model` and `Entity.model`. Setting this to `false` allows different length animations to loop asynchronously over the duration of the longest animation.
 
 ### 1.39 - 2017-11-01
diff --git a/Documentation/Contributors/CodingGuide/README.md b/Documentation/Contributors/CodingGuide/README.md
index b5f5c943c313..6492ac3c13c7 100644
--- a/Documentation/Contributors/CodingGuide/README.md
+++ b/Documentation/Contributors/CodingGuide/README.md
@@ -797,6 +797,8 @@ From release to release, we strive to keep the public Cesium API stable but also
 
 A `@private` API is considered a Cesium implementation detail and can be broken immediately without deprecation.
 
+An `@experimental` API is subject to breaking changes in future Cesium releases without deprecation. It allows for new experimental features, for instance implementing draft formats.
+
 A public identifier (class, function, property) should be deprecated before being removed.  To do so:
 
 * Decide on which future version the deprecated API should be removed.  This is on a case-by-case basis depending on how badly it impacts users and Cesium development.  Most deprecated APIs will removed in 1-3 releases.  This can be discussed in the pull request if needed.