From 5b39e7add71d73ac8128a3504090917c669cc090 Mon Sep 17 00:00:00 2001
From: mhartington <mikehartington@gmail.com>
Date: Fri, 4 Dec 2015 17:21:10 -0500
Subject: [PATCH 1/2] docs(slides)

---
 ionic/components/slides/slides.ts | 53 ++++++++++++++++---------------
 1 file changed, 27 insertions(+), 26 deletions(-)

diff --git a/ionic/components/slides/slides.ts b/ionic/components/slides/slides.ts
index a1123e4b99..4f663b2721 100644
--- a/ionic/components/slides/slides.ts
+++ b/ionic/components/slides/slides.ts
@@ -33,35 +33,36 @@ import {Scroll} from '../scroll/scroll';
  * ```ts
  * @Page({
  *  template: `
- *         <ion-slides pager (slide-changed)="onSlideChanged($event)" loop="true" autoplay="true">
- *          <ion-slide>
- *            <h3>Thank you for choosing the Awesome App!</h3>
- *            <p>
- *              The number one app for everything awesome.
- *            </p>
- *          </ion-slide>
- *          <ion-slide>
- *            <h3>Using Awesome</h3>
- *             <div id="list">
- *               <h5>Just three steps:</h5>
- *               <ol>
- *                 <li>Be awesome</li>
- *                 <li>Stay awesome</li>
- *                 <li>There is no step 3</li>
- *               </ol>
- *             </div>
- *          </ion-slide>
- *          <ion-slide>
- *            <h3>Any questions?</h3>
- *          </ion-slide>
- *        </ion-slides>
- *        `
+ *     <ion-slides pager (slide-changed)="onSlideChanged($event)" loop="true" autoplay="true">
+ *      <ion-slide>
+ *        <h3>Thank you for choosing the Awesome App!</h3>
+ *        <p>
+ *          The number one app for everything awesome.
+ *        </p>
+ *      </ion-slide>
+ *      <ion-slide>
+ *        <h3>Using Awesome</h3>
+ *         <div id="list">
+ *           <h5>Just three steps:</h5>
+ *           <ol>
+ *             <li>Be awesome</li>
+ *             <li>Stay awesome</li>
+ *             <li>There is no step 3</li>
+ *           </ol>
+ *         </div>
+ *      </ion-slide>
+ *      <ion-slide>
+ *        <h3>Any questions?</h3>
+ *      </ion-slide>
+ *    </ion-slides>
+ *    `
  *})
  *
  *```
- * @property {Any} [autoplay] - whether or not the slides should automatically change
- * @property {Any} [loop] - whether the slides should loop from the last slide back to the first
- * @property {Any} [bounce] - whether the slides should bounce
+ * @property {Boolean} [autoplay] - whether or not the slides should automatically change
+ * @property {Boolean} [loop] - whether the slides should loop from the last slide back to the first
+ * @property {Boolean} [bounce] - whether the slides should bounce
+ * @property {Number} [index] - The slide index to start on
  * @property [pager] - add this property to enable the slide pager
  * @property {Any} [slideChanged] - expression to evaluate when a slide has been changed
  * @see {@link /docs/v2/components#slides Slides Component Docs}

From 0aaf464b766863c673c26fd365a68c3482cd8202 Mon Sep 17 00:00:00 2001
From: perry <perry@ionic.io>
Date: Fri, 4 Dec 2015 17:38:42 -0600
Subject: [PATCH 2/2] docs(djeni): fixing side menu and api demo iframe

---
 scripts/docs/processors/index-page.js       | 2 +-
 scripts/docs/templates/common.template.html | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/docs/processors/index-page.js b/scripts/docs/processors/index-page.js
index 0866b104a4..81ed8cd4df 100644
--- a/scripts/docs/processors/index-page.js
+++ b/scripts/docs/processors/index-page.js
@@ -10,7 +10,7 @@ module.exports = function indexPage(renderDocsProcessor) {
       var currentVersion = versionData.current.name;
       var latestVersion = versionData.latest.name;
 
-      var versionPath = currentVersion == latestVersion ? '' : currentVersion;
+      var versionPath = currentVersion == 'nightly' ? '' : currentVersion;
 
       docs.push({
         docType: 'index-page',
diff --git a/scripts/docs/templates/common.template.html b/scripts/docs/templates/common.template.html
index 470def8422..7b3092ecf5 100644
--- a/scripts/docs/templates/common.template.html
+++ b/scripts/docs/templates/common.template.html
@@ -9,8 +9,8 @@ title: "<@ if doc.docType == "directive" @><$ doc.name | dashCase $><@ else @><$
 header_sub_title: "<$ doc.docType | capital $> in module <$ doc.module $>"
 doc: "<$ doc.name $>"
 docType: "<$ doc.docType $>"
-<@ if doc.demo and false @>show_preview_device: true
-preview_device_url= "<$ doc.demo $>"<@ endif @>
+<@ if doc.demo @>show_preview_device: true
+preview_device_url: "<$ doc.demo $>"<@ endif @>
 ---