Merge lp:~developer-ubuntu-com-dev/developer-ubuntu-com/hero-tour-changes into lp:developer-ubuntu-com

[Daniel Holbach]

### Template ###

Template details for testing purposes:

The template currently assumes the following snappy page tree, where all the pages starting from "ubuntu-core-developers-tour" are using the "Snappy Hero Tour" template.

snappy
    get-started
        ubuntu-core-developers-tour
            16-04 (redirect to ubuntu-core-developers-tour)
                step2-<host>-<target> (eg. step2-ubuntu-raspi2)
                step3-*
                step4-*
                step5-*
            15-10 (redirect to ubuntu-core-developers-tour)
                step2-*
                step3-*
                step4-*
                step5-*

The template provides a shell for content, this content is CMS editable and/or imported via the md importer.

Examples:
- http://i.imgur.com/WlMcMeH.png
- http://i.imgur.com/awWXsrp.png

The ubuntu-core-developers-tour page needs to contain specific data for tour navigation to work as intended:
- The snappy version selector needs name="version"
- Each radio input needs name="host" (for host choices) or name="target" (for board choices)

V0 of the tour landing page: http://paste.ubuntu.com/15328791/

[lp:~developer-ubuntu-com-dev/developer-ubuntu-com/hero-tour-changes]

219. By David Callé on 2016-03-08

Add first iteration of the snappy hero tour

220. By Daniel Holbach on 2016-03-09

fix unicode craziness

221. By Daniel Holbach on 2016-03-09

extend db_add_empty_page do you can define your own slug

222. By Daniel Holbach on 2016-03-10

add tests for hero tour IA

223. By Daniel Holbach on 2016-03-21

merge trunk

224. By Daniel Holbach on 2016-03-22

merge trunk

[David Callé (davidc3)]

Everything looks and tests are very nice!

Except this failing one:

======================================================================
FAIL: runTest (md_importer.tests.test_link_rewrite.TestLinkRewrite)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/home/david/dev/duc/mtotrunk_mar16/developer-ubuntu-com/md_importer/tests/test_link_rewrite.py", line 37, in runTest
    self.assertEqual(link.attrs['href'], '/file2')
AssertionError: u'/en/file2/' != '/file2'

review: Needs Fixing

[David Callé (davidc3)]

looks good*

[Daniel Holbach (dholbach)]

Ran 32 tests in 153.276s

OK

[lp:~developer-ubuntu-com-dev/developer-ubuntu-com/hero-tour-changes]

225. By Daniel Holbach on 2016-03-22

adapt url expectation to a crash David was seeing

226. By Daniel Holbach on 2016-03-22

make pep8/pyflakes happy

227. By Daniel Holbach on 2016-03-22

apply fix from David - thanks

=== modified file 'developer_portal/settings.py'
--- developer_portal/settings.py	2016-02-19 10:14:32 +0000
+++ developer_portal/settings.py	2016-03-22 10:52:56 +0000
@@ -185,6 +185,7 @@
     ('landing_page.html', 'Landing Page'),
     ('no_subnav.html', 'Without Subnav'),
     ('with_hero.html', 'With Hero'),
+    ('snappy_hero_tour.html', 'Snappy Hero Tour'),
 )
 
 LOCALE_PATHS = (

=== modified file 'md_importer/importer/__init__.py'
--- md_importer/importer/__init__.py	2016-02-29 14:20:41 +0000
+++ md_importer/importer/__init__.py	2016-03-22 10:52:56 +0000
@@ -1,5 +1,7 @@
 from developer_portal.settings import LANGUAGE_CODE
 
+from md_importer.models import ExternalDocsBranchImportDirective
+
 DEFAULT_LANG = LANGUAGE_CODE
 HOME_PAGE_URL = '/{}/'.format(DEFAULT_LANG)
 SUPPORTED_ARTICLE_TYPES = ['.md', '.html']
@@ -15,3 +17,7 @@
     'pymdownx.tasklist',
     'pymdownx.superfences',
 ]
+
+model_info = ExternalDocsBranchImportDirective._meta
+TEMPLATE_CHOICES = model_info.get_field('template').choices
+DEFAULT_TEMPLATE = model_info.get_field('template').default

=== modified file 'md_importer/importer/article.py'
--- md_importer/importer/article.py	2016-03-02 11:13:43 +0000
+++ md_importer/importer/article.py	2016-03-22 10:52:56 +0000
@@ -20,7 +20,7 @@
 
 
 class Article:
-    def __init__(self, fn, write_to):
+    def __init__(self, fn, write_to, advertise, template):
         self.html = None
         self.page = None
         self.title = ""
@@ -30,6 +30,8 @@
         self.slug = os.path.basename(self.full_url)
         self.links_rewritten = False
         self.local_images = []
+        self.advertise = advertise
+        self.template = template
 
     def _find_local_images(self):
         '''Local images are currently not supported.'''
@@ -116,7 +118,8 @@
         '''Publishes pages in their branch alias namespace.'''
         self.page = get_or_create_page(
             title=self.title, full_url=self.full_url, menu_title=self.title,
-            html=self.html)
+            html=self.html, in_navigation=self.advertise,
+            template=self.template)
         if not self.page:
             return False
         self.full_url = re.sub(
@@ -127,7 +130,8 @@
     def publish(self):
         if self.links_rewritten:
             update_page(self.page, title=self.title, full_url=self.full_url,
-                        menu_title=self.title, html=self.html)
+                        menu_title=self.title, html=self.html,
+                        in_navigation=self.advertise, template=self.template)
         if self.page.is_dirty(DEFAULT_LANG):
             self.page.publish(DEFAULT_LANG)
             if self.page.get_public_object():

=== modified file 'md_importer/importer/process.py'
--- md_importer/importer/process.py	2016-01-16 00:36:39 +0000
+++ md_importer/importer/process.py	2016-03-22 10:52:56 +0000
@@ -22,7 +22,9 @@
     for directive in ExternalDocsBranchImportDirective.objects.filter(
             external_docs_branch=branch):
         repo.add_directive(directive.import_from,
-                           directive.write_to)
+                           directive.write_to,
+                           directive.advertise,
+                           directive.template)
     if not repo.execute_import_directives():
         return False
     if not repo.publish():

=== modified file 'md_importer/importer/publish.py'
--- md_importer/importer/publish.py	2016-02-29 14:25:52 +0000
+++ md_importer/importer/publish.py	2016-03-22 10:52:56 +0000
@@ -1,4 +1,8 @@
-from md_importer.importer import DEFAULT_LANG, HOME_PAGE_URL
+from md_importer.importer import (
+    DEFAULT_LANG,
+    DEFAULT_TEMPLATE,
+    HOME_PAGE_URL,
+)
 
 from cms.api import create_page, add_plugin
 from cms.models import Title
@@ -51,7 +55,7 @@
 
 
 def update_page(page, title, full_url, menu_title=None,
-                in_navigation=True, redirect=None, html=None):
+                in_navigation=True, redirect=None, html=None, template=None):
     if page.get_title() != title:
         page.title = title
     if page.get_menu_title() != menu_title:
@@ -60,6 +64,8 @@
         page.in_navigation = in_navigation
     if page.get_redirect() != redirect:
         page.redirect = redirect
+    if page.template != template:
+        page.template = template
     if html:
         update = True
         (placeholder, plugin) = find_text_plugin(page)
@@ -85,23 +91,24 @@
 
 
 def get_or_create_page(title, full_url, menu_title=None,
-                       in_navigation=True, redirect=None, html=None):
+                       in_navigation=True, redirect=None, html=None,
+                       template=DEFAULT_TEMPLATE):
     # First check if pages already exist.
     pages = Title.objects.select_related('page').filter(
         path__regex=full_url).filter(publisher_is_draft=True)
     if pages:
         page = pages[0].page
         update_page(page, title, full_url, menu_title, in_navigation,
-                    redirect, html)
+                    redirect, html, template)
     else:
         parent = _find_parent(full_url)
         if not parent:
             return None
         slug = os.path.basename(full_url)
         page = create_page(
-            title, 'default.html', DEFAULT_LANG, slug=slug, parent=parent,
-            menu_title=menu_title, in_navigation=in_navigation,
+            title=title, template=template, language=DEFAULT_LANG, slug=slug,
+            parent=parent, menu_title=menu_title, in_navigation=in_navigation,
             position='last-child', redirect=redirect)
-        placeholder = page.placeholders.get()
+        placeholder = page.placeholders.all()[0]
         add_plugin(placeholder, 'RawHtmlPlugin', DEFAULT_LANG, body=html)
     return page

=== modified file 'md_importer/importer/repo.py'
--- md_importer/importer/repo.py	2016-01-28 17:23:38 +0000
+++ md_importer/importer/repo.py	2016-03-22 10:52:56 +0000
@@ -6,6 +6,8 @@
 from .publish import get_or_create_page, slugify
 from .source import SourceCode
 
+from md_importer.models import ExternalDocsBranchImportDirective
+
 import glob
 import logging
 import os
@@ -56,12 +58,18 @@
             return 1
         return 0
 
-    def add_directive(self, import_from, write_to):
+    def add_directive(self, import_from, write_to, advertise=True,
+                      template=None):
+        if template is None:
+            model_info = ExternalDocsBranchImportDirective._meta
+            template = model_info.get_field('template').default
         self.directives += [
             {
                 'import_from': os.path.join(self.checkout_location,
                                             import_from),
-                'write_to': write_to
+                'write_to': write_to,
+                'advertise': advertise,
+                'template': template,
             }
         ]
 
@@ -71,7 +79,8 @@
         for directive in [d for d in self.directives
                           if os.path.isfile(d['import_from'])]:
             import_list += [
-                (directive['import_from'], directive['write_to'])
+                (directive['import_from'], directive['write_to'],
+                 directive['advertise'], directive['template'])
             ]
         # Import directories next
         for directive in [d for d in self.directives
@@ -79,7 +88,8 @@
             for fn in glob.glob('{}/*'.format(directive['import_from'])):
                 if fn not in [a[0] for a in import_list]:
                     import_list += [
-                        (fn, os.path.join(directive['write_to'], slugify(fn)))
+                        (fn, os.path.join(directive['write_to'], slugify(fn)),
+                         directive['advertise'], directive['template'])
                     ]
             # If we import into a namespace and don't have an index doc,
             # we need to write one.
@@ -91,7 +101,8 @@
                 return False
         # The actual import
         for entry in import_list:
-            article = self._read_article(entry[0], entry[1])
+            article = self._read_article(
+                entry[0], entry[1], entry[2], entry[3])
             if article:
                 self.imported_articles += [article]
                 self.titles[article.fn] = article.title
@@ -106,8 +117,8 @@
             self._write_fake_index_doc()
         return True
 
-    def _read_article(self, fn, write_to):
-        article = self.article_class(fn, write_to)
+    def _read_article(self, fn, write_to, advertise, template):
+        article = self.article_class(fn, write_to, advertise, template)
         if article.read():
             return article
         return None
@@ -142,12 +153,13 @@
         return True
 
     def _write_fake_index_doc(self):
-        list_pages = ''
+        list_pages = u''
         for article in [a for a
                         in self.imported_articles
                         if a.full_url.startswith(self.index_doc_url)]:
-            list_pages += '<li><a href=\"{}\">{}</a></li>'.format(
-                os.path.basename(article.full_url), article.title)
+            list_pages += u'<li><a href=\"{}\">{}</a></li>'.format(
+                unicode(os.path.basename(article.full_url)),
+                article.title)
         self.index_page.html = (
             u'<div class=\"row\"><div class=\"eight-col\">\n'
             '<p>This section contains documentation for the '

=== added file 'md_importer/migrations/0002_hero_tour_changes.py'
--- md_importer/migrations/0002_hero_tour_changes.py	1970-01-01 00:00:00 +0000
+++ md_importer/migrations/0002_hero_tour_changes.py	2016-03-22 10:52:56 +0000
@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('md_importer', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='externaldocsbranchimportdirective',
+            name='advertise',
+            field=models.BooleanField(default=True, help_text='Should the imported articles be listed in the navigation? Default: yes.'),
+        ),
+        migrations.AddField(
+            model_name='externaldocsbranchimportdirective',
+            name='template',
+            field=models.CharField(default=b'default.html', help_text='Django CMS template to use for the imported articles. Default: default.html', max_length=50, choices=[(b'default.html', b'Default'), (b'landing_page.html', b'Landing Page'), (b'no_subnav.html', b'Without Subnav'), (b'with_hero.html', b'With Hero')]),
+        ),
+    ]

=== modified file 'md_importer/models.py'
--- md_importer/models.py	2016-01-11 08:10:08 +0000
+++ md_importer/models.py	2016-03-22 10:52:56 +0000
@@ -1,9 +1,18 @@
+from django.conf import settings
 from django.db import models
 from django.utils.translation import ugettext_lazy as _
 
 from cms.models import Page
 
 
+if settings.CMS_TEMPLATES:
+    cms_templates = settings.CMS_TEMPLATES
+else:
+    cms_templates = (
+        ('default.html', 'Default'),
+    )
+
+
 class ExternalDocsBranch(models.Model):
     origin = models.CharField(
         max_length=200,
@@ -43,6 +52,18 @@
         help_text=_('Article URL (for a specific file) or article namespace '
                     'for a directory or a set of files.'),
         blank=True)
+    advertise = models.BooleanField(
+        default=True,
+        help_text=_('Should the imported articles be listed in the '
+                    'navigation? Default: yes.'),
+    )
+    template = models.CharField(
+        max_length=50,
+        default=cms_templates[0][0],
+        choices=cms_templates,
+        help_text=_('Django CMS template to use for the imported articles. '
+                    'Default: {}'.format(cms_templates[0][0])),
+    )
 
     def __str__(self):
         return "{} -- {}".format(self.external_docs_branch,

=== added directory 'md_importer/tests/data/website-test'
=== added directory 'md_importer/tests/data/website-test/out'
=== added directory 'md_importer/tests/data/website-test/out/get-started'
=== added directory 'md_importer/tests/data/website-test/out/get-started/as-dev'
=== added directory 'md_importer/tests/data/website-test/out/get-started/as-dev/16.04'
=== added file 'md_importer/tests/data/website-test/out/get-started/as-dev/16.04/step2-setup-beaglebone-macos.md'
--- md_importer/tests/data/website-test/out/get-started/as-dev/16.04/step2-setup-beaglebone-macos.md	1970-01-01 00:00:00 +0000
+++ md_importer/tests/data/website-test/out/get-started/as-dev/16.04/step2-setup-beaglebone-macos.md	2016-03-22 10:52:56 +0000
@@ -0,0 +1,77 @@
+# Setting up your Beaglebone Black
+
+![Beaglebone Black image](https://raw.githubusercontent.com/ubuntu-core/snappy-dev-website/master/src/img/devices/beaglebone.png "Beaglebone Black image")
+
+From your desktop computer, you can download and install a pre-built Snappy Ubuntu Core 16.04 image for your Beaglebone Black and copy it to an SD card. You can then get started with your project!
+
+> Make sure your board is connected to the same network as your computer to manage Ubuntu Core remotely via SSH, or has a screen and keyboard attached if you prefer managing Ubuntu Core directly on the board.
+
+## Downloading and installing
+
+1. Start by **downloading the Ubuntu Core image** for Beaglebone Black in your current folder.
+```sh
+curl -O http://people.canonical.com/~mvo/all-snaps/bbb-all-snap.img.xz
+```
+
+1. **Extract** the downloaded zip file into your Downloads folder by double clicking on it. You should now have an uncompressed file named bbb-all-snap.img.
+> You might have to install archive extractor software, like [The Unarchiver](https://itunes.apple.com/gb/app/the-unarchiver/id425424353?mt=12) or similar as the standard tools do not support xz
+
+1. **Insert your SD card**. Ensure there is no data you care about on the SD card before running the commands below.
+
+1. **Determine which disk to write to and inmount it**.
+ * Run
+```sh
+diskutil list
+```
+ In the results identify your SD card, it will probably an entry like the one below:
+```sh
+/dev/disk0
+  #:                       TYPE NAME                    SIZE       IDENTIFIER
+  0:      GUID_partition_scheme                        *500.3 GB   disk0
+/dev/disk2
+  #:                       TYPE NAME                    SIZE       IDENTIFIER
+  0:                  Apple_HFS Macintosh HD           *428.8 GB   disk1
+                                Logical Volume on disk0s2
+                                E2E7C215-99E4-486D-B3CC-DAB8DF9E9C67
+                                Unlocked Encrypted
+/dev/disk3
+  #:                       TYPE NAME                    SIZE       IDENTIFIER
+  0:     FDisk_partition_scheme                        *7.9 GB     disk3
+  1:                 DOS_FAT_32 NO NAME                 7.9 GB     disk3s1
+```
+ > Note that your SD Card must be DOS_FAT_32 formatted. The SIZE will be the size of your SD card, in this example an 8GB SD Card.
+
+ Write down the number after /dev/disk that is associated with your SD card, in this case 3.
+
+ * Unmount your SD card by entering the command:
+ `diskutil unmountDisk /dev/diskX` where X is the number you just wrote down. When successful you should see a message similar to this one: *Unmount of all volumes on diskX was successful*.
+
+1. **Copy your downloaded image to the SD card**. Note that you need to specify the path to the disk device with the number you just wrote down in previous step.
+```sh
+sudo dd if=~/Downloads/bbb-all-snap.img of=/dev/diskX bs=32MB
+sync
+```
+You will be prompted to enter your Apple password after this command.
+
+ > Note that this operation length can vary depending on your SD card speed. There is no progress displayed unless you send SIGINFO signal pressing Ctrl+T.
+
+1. **Eject** the SD card physically from your Mac and **insert it** in your Beaglebone Black.
+
+## First boot to Ubuntu Core 16.04
+
+> Note that the first boot can be longer than usual as your primary disk is repartioned to take all available free space.
+
+Power on your Beaglebone Black and wait a couple of minutes for the OS to complete its first boot.
+
+You can then access your snappy Ubuntu Core system by loading the webdm interface from your browser. Just point it to
+http://webdm.local:4200.
+
+![Webdm vanilla interface](https://raw.githubusercontent.com/ubuntu-core/snappy-dev-website/master/src/img/setup/webdm.png)
+
+Since we require our own boot loader in order to be fully compatible with Snappy, it's recommended to remove the bootloader available in the eMMC partition:
+* On first boot (or each boot if you don't want to erase the bootloader available at the eMMC), you can also force it to boot to the sd card by pressing the user/boot switch button before powering up the device.
+* Then, to remove the bootloader in the eMMC partition, you can run the following command on you Ubuntu Core system: `sudo dd if=/dev/zero of=/dev/mmcblk1 bs=1024 count=1024`
+
+
+Congrats, you just installed your new Snappy Ubuntu Core 16.04 system. It's now time to explore it and
+install some snaps to it!

=== added file 'md_importer/tests/data/website-test/out/get-started/as-dev/16.04/step2-setup-beaglebone-ubuntu.md'
--- md_importer/tests/data/website-test/out/get-started/as-dev/16.04/step2-setup-beaglebone-ubuntu.md	1970-01-01 00:00:00 +0000
+++ md_importer/tests/data/website-test/out/get-started/as-dev/16.04/step2-setup-beaglebone-ubuntu.md	2016-03-22 10:52:56 +0000
@@ -0,0 +1,49 @@
+# Setting up your Beaglebone Black
+
+![Beaglebone Black image](https://raw.githubusercontent.com/ubuntu-core/snappy-dev-website/master/src/img/devices/beaglebone.png "Beaglebone Black image")
+
+From your desktop computer, you can download and install a pre-built Snappy Ubuntu Core 16.04 image for your Beaglebone Black and copy it to an SD card. You can then get started with your project!
+
+> Make sure your board is connected to the same network as your computer to manage Ubuntu Core remotely via SSH, or has a screen and keyboard attached if you prefer managing Ubuntu Core directly on the board.
+
+## Downloading and installing
+
+1. Start by **downloading the Ubuntu Core image** for Beaglebone Black in your current folder.
+```sh
+wget http://people.canonical.com/~mvo/all-snaps/bbb-all-snap.img.xz
+```
+Once the download is finished, you’ll have a zip file named bbb-all-snap.img.xz.
+
+1. **Insert your SD card**. Ensure there is no data you care about on the SD card before performing next steps below.
+
+1. **Unmount it**: if your SD card is mounted when you insert it into your computer (you will know it if the file manager automatically opens a window showing the card's contents), you must manually unmount it before writing the snappy image to it. Either eject your SD card from the file manager, or from the command line: `sudo umount /media/$USER/`
+
+1. **Copy your downloaded image to the SD card**. You must specify the path to the disk device representing your SD card in the dd command below. Common device paths for the SD card disk device are either of the form **/dev/sdX** (such as **/dev/sdb**, not /dev/sdb1!) or **/dev/mmcblk0** (not /dev/mmcblk0p1!)
+```sh
+xzcat bbb-all-snap.img.xz | sudo dd of=/dev/sdX bs=32M
+sync
+```
+ You will be prompted to enter your password after this command.
+
+ > Note that this operation length can vary depending on your SD card speed. There is no progress displayed unless you send SIGINFO signal pressing Ctrl+T.
+
+1. **Eject** the SD card physically from your PC and **insert it** in your Beaglebone Black.
+
+## First boot to Ubuntu Core 16.04
+
+> Note that the first boot can be longer than usual as your primary disk is repartioned to take all available free space.
+
+Power on your Beaglebone Black and wait a couple of minutes for the OS to complete its first boot.
+
+You can then access your snappy Ubuntu Core system by loading the webdm interface from your browser. Just point it to
+http://webdm.local:4200.
+
+![Webdm vanilla interface](https://raw.githubusercontent.com/ubuntu-core/snappy-dev-website/master/src/img/setup/webdm.png)
+
+Since we require our own boot loader in order to be fully compatible with Snappy, it's recommended to remove the bootloader available in the eMMC partition:
+* On first boot (or each boot if you don't want to erase the bootloader available at the eMMC), you can also force it to boot to the sd card by pressing the user/boot switch button before powering up the device.
+* Then, to remove the bootloader in the eMMC partition, you can run the following command on you Ubuntu Core system: `sudo dd if=/dev/zero of=/dev/mmcblk1 bs=1024 count=1024`
+
+
+Congrats, you just installed your new Snappy Ubuntu Core 16.04 system. It's now time to explore it and
+install some snaps to it!

=== added file 'md_importer/tests/data/website-test/out/get-started/as-dev/16.04/step2-setup-beaglebone-windows.md'
--- md_importer/tests/data/website-test/out/get-started/as-dev/16.04/step2-setup-beaglebone-windows.md	1970-01-01 00:00:00 +0000
+++ md_importer/tests/data/website-test/out/get-started/as-dev/16.04/step2-setup-beaglebone-windows.md	2016-03-22 10:52:56 +0000
@@ -0,0 +1,53 @@
+# Setting up your Beaglebone Black
+
+![Beaglebone Black image](https://raw.githubusercontent.com/ubuntu-core/snappy-dev-website/master/src/img/devices/beaglebone.png "Beaglebone Black image")
+
+From your desktop computer, you can download and install a pre-built Snappy Ubuntu Core 16.04 image for your Beaglebone Black and copy it to an SD card. You can then get started with your project!
+
+> Make sure your board is connected to the same network as your computer to manage Ubuntu Core remotely via SSH, or has a screen and keyboard attached if you prefer managing Ubuntu Core directly on the board.
+
+## Downloading and installing
+
+1. Start by **downloading the Ubuntu Core image** for Beaglebone Black in your **Downloads** folder from [this link](http://people.canonical.com/~mvo/all-snaps/bbb-all-snap.img.xz).
+Once the download is finished, you’ll have a zip file named bbb-all-snap.img.xz.
+
+1. **Extract** the downloaded zip file into your Downloads folder. You should now have an uncompressed file named bbb-all-snap.img.
+> You might have to install archive extractor software, like [7-zip](http://www.7-zip.org/) or similar as the standard tools do not support xz
+
+1. **Insert your SD card**. Ensure there is no data you care about on the SD card before performing next steps below.
+
+1. **Copy your downloaded image to the SD card**. Install and launch [Win32DiskImager](http://sourceforge.net/projects/win32diskimager/files/latest/download).
+ > Find out where what drive your SD card is mounted to. Open a File Explorer window to check which drive your SD card is listed under.  Here is an example of a card listed under **E:** and the setup in Diskimager.
+
+ ![Windows drives](https://raw.githubusercontent.com/ubuntu-core/snappy-dev-website/master/src/img/setup/windows-drives.png)
+
+  Win32DiskImager will need 2 elements:
+   * *An Image File* which is the file you want to copy on your SD Card. Navigate to your *Downloads* folder and select the bbb-all-snap.img image you have just extracted.
+   * *A Device* which is the location of your SD card. Select the Drive in which your SD card is mounted.
+
+   ![Win32DiskImager image selection](https://raw.githubusercontent.com/ubuntu-core/snappy-dev-website/master/src/img/setup/windows-diskimager-setup.png)
+
+  > To be safe, unplug every External USB Drive you may have connected to your PC.
+
+  When ready click on Write and wait for the process to complete.
+
+1. Exit from Win32DiskImager. **Eject** the SD card from the File Explorer window and **insert it** in your Beaglebone Black.
+
+## First boot to Ubuntu Core 16.04
+
+> Note that the first boot can be longer than usual as your primary disk is repartioned to take all available free space.
+
+Power on your Beaglebone Black and wait a couple of minutes for the OS to complete its first boot.
+
+You can then access your snappy Ubuntu Core system by loading the webdm interface from your browser. Just point it to
+http://webdm.local:4200.
+
+![Webdm vanilla interface](https://raw.githubusercontent.com/ubuntu-core/snappy-dev-website/master/src/img/setup/webdm.png)
+
+Since we require our own boot loader in order to be fully compatible with Snappy, it's recommended to remove the bootloader available in the eMMC partition:
+* On first boot (or each boot if you don't want to erase the bootloader available at the eMMC), you can also force it to boot to the sd card by pressing the user/boot switch button before powering up the device.
+* Then, to remove the bootloader in the eMMC partition, you can run the following command on you Ubuntu Core system: `sudo dd if=/dev/zero of=/dev/mmcblk1 bs=1024 count=1024`
+
+
+Congrats, you just installed your new Snappy Ubuntu Core 16.04 system. It's now time to explore it and
+install some snaps to it!

=== added file 'md_importer/tests/data/website-test/out/get-started/as-dev/16.04/step2-setup-dragonboard-macos.md'
--- md_importer/tests/data/website-test/out/get-started/as-dev/16.04/step2-setup-dragonboard-macos.md	1970-01-01 00:00:00 +0000
+++ md_importer/tests/data/website-test/out/get-started/as-dev/16.04/step2-setup-dragonboard-macos.md	2016-03-22 10:52:56 +0000
@@ -0,0 +1,74 @@
+# Setting up your DragonBoard
+
+![DragonBoard image](https://raw.githubusercontent.com/ubuntu-core/snappy-dev-website/master/src/img/devices/dragonboard.png "DragonBoard image")
+
+From your desktop computer, you can download and install a pre-built Snappy Ubuntu Core 16.04 image for your DragonBoard and copy it to an SD card. You can then get started with your project!
+
+> Make sure your board is connected to the same network as your computer to manage Ubuntu Core remotely via SSH, or has a screen and keyboard attached if you prefer managing Ubuntu Core directly on the board.
+
+## Downloading and installing
+
+1. Start by **downloading the Ubuntu Core image** for DragonBoard in your current folder.
+```sh
+curl -O http://people.canonical.com/~ogra/snappy/all-snaps/dragonboard/dragon-all-snap.img.xz
+```
+
+1. **Extract** the downloaded zip file into your Downloads folder by double clicking on it. You should now have an uncompressed file named dragon-all-snap.img.
+> You might have to install archive extractor software, like [The Unarchiver](https://itunes.apple.com/gb/app/the-unarchiver/id425424353?mt=12) or similar as the standard tools do not support xz
+
+1. **Insert your SD card**. Ensure there is no data you care about on the SD card before running the commands below.
+
+1. **Determine which disk to write to and inmount it**.
+ * Run
+```sh
+diskutil list
+```
+ In the results identify your SD card, it will probably an entry like the one below:
+```sh
+/dev/disk0
+  #:                       TYPE NAME                    SIZE       IDENTIFIER
+  0:      GUID_partition_scheme                        *500.3 GB   disk0
+/dev/disk2
+  #:                       TYPE NAME                    SIZE       IDENTIFIER
+  0:                  Apple_HFS Macintosh HD           *428.8 GB   disk1
+                                Logical Volume on disk0s2
+                                E2E7C215-99E4-486D-B3CC-DAB8DF9E9C67
+                                Unlocked Encrypted
+/dev/disk3
+  #:                       TYPE NAME                    SIZE       IDENTIFIER
+  0:     FDisk_partition_scheme                        *7.9 GB     disk3
+  1:                 DOS_FAT_32 NO NAME                 7.9 GB     disk3s1
+```
+ > Note that your SD Card must be DOS_FAT_32 formatted. The SIZE will be the size of your SD card, in this example an 8GB SD Card.
+
+ Write down the number after /dev/disk that is associated with your SD card, in this case 3.
+
+ * Unmount your SD card by entering the command:
+ `diskutil unmountDisk /dev/diskX` where X is the number you just wrote down. When successful you should see a message similar to this one: *Unmount of all volumes on diskX was successful*.
+
+1. **Copy your downloaded image to the SD card**. Note that you need to specify the path to the disk device with the number you just wrote down in previous step.
+```sh
+sudo dd if=~/Downloads/dragon-all-snap.img of=/dev/diskX bs=32MB
+sync
+```
+You will be prompted to enter your Apple password after this command.
+
+ > Note that this operation length can vary depending on your SD card speed. There is no progress displayed unless you send SIGINFO signal pressing Ctrl+T.
+
+1. **Eject** the SD card physically from your Mac and **insert it** in your DragonBoard.
+
+## First boot to Ubuntu Core 16.04
+
+> Note that the first boot can be longer than usual as your primary disk is repartioned to take all available free space.
+
+Power on your DragonBoard and wait a couple of minutes for the OS to complete its first boot.
+
+You can then access your snappy Ubuntu Core system by loading the webdm interface from your browser. Just point it to
+http://webdm.local:4200.
+
+![Webdm vanilla interface](https://raw.githubusercontent.com/ubuntu-core/snappy-dev-website/master/src/img/setup/webdm.png)
+
+<<ADDITIONAL_FIRST_BOOT_NOTES>>
+
+Congrats, you just installed your new Snappy Ubuntu Core 16.04 system. It's now time to explore it and
+install some snaps to it!

=== added file 'md_importer/tests/data/website-test/out/get-started/as-dev/16.04/step2-setup-dragonboard-ubuntu.md'
--- md_importer/tests/data/website-test/out/get-started/as-dev/16.04/step2-setup-dragonboard-ubuntu.md	1970-01-01 00:00:00 +0000
+++ md_importer/tests/data/website-test/out/get-started/as-dev/16.04/step2-setup-dragonboard-ubuntu.md	2016-03-22 10:52:56 +0000
@@ -0,0 +1,46 @@
+# Setting up your DragonBoard
+
+![DragonBoard image](https://raw.githubusercontent.com/ubuntu-core/snappy-dev-website/master/src/img/devices/dragonboard.png "DragonBoard image")
+
+From your desktop computer, you can download and install a pre-built Snappy Ubuntu Core 16.04 image for your DragonBoard and copy it to an SD card. You can then get started with your project!
+
+> Make sure your board is connected to the same network as your computer to manage Ubuntu Core remotely via SSH, or has a screen and keyboard attached if you prefer managing Ubuntu Core directly on the board.
+
+## Downloading and installing
+
+1. Start by **downloading the Ubuntu Core image** for DragonBoard in your current folder.
+```sh
+wget http://people.canonical.com/~ogra/snappy/all-snaps/dragonboard/dragon-all-snap.img.xz
+```
+Once the download is finished, you’ll have a zip file named dragon-all-snap.img.xz.
+
+1. **Insert your SD card**. Ensure there is no data you care about on the SD card before performing next steps below.
+
+1. **Unmount it**: if your SD card is mounted when you insert it into your computer (you will know it if the file manager automatically opens a window showing the card's contents), you must manually unmount it before writing the snappy image to it. Either eject your SD card from the file manager, or from the command line: `sudo umount /media/$USER/`
+
+1. **Copy your downloaded image to the SD card**. You must specify the path to the disk device representing your SD card in the dd command below. Common device paths for the SD card disk device are either of the form **/dev/sdX** (such as **/dev/sdb**, not /dev/sdb1!) or **/dev/mmcblk0** (not /dev/mmcblk0p1!)
+```sh
+xzcat dragon-all-snap.img.xz | sudo dd of=/dev/sdX bs=32M
+sync
+```
+ You will be prompted to enter your password after this command.
+
+ > Note that this operation length can vary depending on your SD card speed. There is no progress displayed unless you send SIGINFO signal pressing Ctrl+T.
+
+1. **Eject** the SD card physically from your PC and **insert it** in your DragonBoard.
+
+## First boot to Ubuntu Core 16.04
+
+> Note that the first boot can be longer than usual as your primary disk is repartioned to take all available free space.
+
+Power on your DragonBoard and wait a couple of minutes for the OS to complete its first boot.
+
+You can then access your snappy Ubuntu Core system by loading the webdm interface from your browser. Just point it to
+http://webdm.local:4200.
+
+![Webdm vanilla interface](https://raw.githubusercontent.com/ubuntu-core/snappy-dev-website/master/src/img/setup/webdm.png)
+
+<<ADDITIONAL_FIRST_BOOT_NOTES>>
+
+Congrats, you just installed your new Snappy Ubuntu Core 16.04 system. It's now time to explore it and
+install some snaps to it!

=== added file 'md_importer/tests/data/website-test/out/get-started/as-dev/16.04/step2-setup-dragonboard-windows.md'
--- md_importer/tests/data/website-test/out/get-started/as-dev/16.04/step2-setup-dragonboard-windows.md	1970-01-01 00:00:00 +0000
+++ md_importer/tests/data/website-test/out/get-started/as-dev/16.04/step2-setup-dragonboard-windows.md	2016-03-22 10:52:56 +0000
@@ -0,0 +1,50 @@
+# Setting up your DragonBoard
+
+![DragonBoard image](https://raw.githubusercontent.com/ubuntu-core/snappy-dev-website/master/src/img/devices/dragonboard.png "DragonBoard image")
+
+From your desktop computer, you can download and install a pre-built Snappy Ubuntu Core 16.04 image for your DragonBoard and copy it to an SD card. You can then get started with your project!
+
+> Make sure your board is connected to the same network as your computer to manage Ubuntu Core remotely via SSH, or has a screen and keyboard attached if you prefer managing Ubuntu Core directly on the board.
+
+## Downloading and installing
+
+1. Start by **downloading the Ubuntu Core image** for DragonBoard in your **Downloads** folder from [this link](http://people.canonical.com/~ogra/snappy/all-snaps/dragonboard/dragon-all-snap.img.xz).
+Once the download is finished, you’ll have a zip file named dragon-all-snap.img.xz.
+
+1. **Extract** the downloaded zip file into your Downloads folder. You should now have an uncompressed file named dragon-all-snap.img.
+> You might have to install archive extractor software, like [7-zip](http://www.7-zip.org/) or similar as the standard tools do not support xz
+
+1. **Insert your SD card**. Ensure there is no data you care about on the SD card before performing next steps below.
+
+1. **Copy your downloaded image to the SD card**. Install and launch [Win32DiskImager](http://sourceforge.net/projects/win32diskimager/files/latest/download).
+ > Find out where what drive your SD card is mounted to. Open a File Explorer window to check which drive your SD card is listed under.  Here is an example of a card listed under **E:** and the setup in Diskimager.
+
+ ![Windows drives](https://raw.githubusercontent.com/ubuntu-core/snappy-dev-website/master/src/img/setup/windows-drives.png)
+
+  Win32DiskImager will need 2 elements:
+   * *An Image File* which is the file you want to copy on your SD Card. Navigate to your *Downloads* folder and select the dragon-all-snap.img image you have just extracted.
+   * *A Device* which is the location of your SD card. Select the Drive in which your SD card is mounted.
+
+   ![Win32DiskImager image selection](https://raw.githubusercontent.com/ubuntu-core/snappy-dev-website/master/src/img/setup/windows-diskimager-setup.png)
+
+  > To be safe, unplug every External USB Drive you may have connected to your PC.
+
+  When ready click on Write and wait for the process to complete.
+
+1. Exit from Win32DiskImager. **Eject** the SD card from the File Explorer window and **insert it** in your DragonBoard.
+
+## First boot to Ubuntu Core 16.04
+
+> Note that the first boot can be longer than usual as your primary disk is repartioned to take all available free space.
+
+Power on your DragonBoard and wait a couple of minutes for the OS to complete its first boot.
+
+You can then access your snappy Ubuntu Core system by loading the webdm interface from your browser. Just point it to
+http://webdm.local:4200.
+
+![Webdm vanilla interface](https://raw.githubusercontent.com/ubuntu-core/snappy-dev-website/master/src/img/setup/webdm.png)
+
+<<ADDITIONAL_FIRST_BOOT_NOTES>>
+
+Congrats, you just installed your new Snappy Ubuntu Core 16.04 system. It's now time to explore it and
+install some snaps to it!

=== added file 'md_importer/tests/data/website-test/out/get-started/as-dev/16.04/step2-setup-intel-nuc-macos.md'
--- md_importer/tests/data/website-test/out/get-started/as-dev/16.04/step2-setup-intel-nuc-macos.md	1970-01-01 00:00:00 +0000
+++ md_importer/tests/data/website-test/out/get-started/as-dev/16.04/step2-setup-intel-nuc-macos.md	2016-03-22 10:52:56 +0000
@@ -0,0 +1,73 @@
+# Setting up your Intel® NUC
+
+![Intel® NUC image](https://raw.githubusercontent.com/ubuntu-core/snappy-dev-website/master/src/img/devices/Thin_Canyon_NUC_Front_Angle_Board.png "Intel® NUC image")
+
+Installing Snappy Ubuntu Core on your Intel® NUC, only takes 3 steps and a 2G USB key:
+1. Install a live version of Ubuntu Classic on a USB key.
+1. Boot on your Intel® NUC from the live USB key.
+1. Install Ubuntu Core onto Intel® NUC disk from the live session.
+And you can get started with your project!
+
+> Make sure your board is connected to the same network as your computer to manage Ubuntu Core remotely via SSH, or has a screen and keyboard attached if you prefer managing Ubuntu Core directly on the board.
+
+## Create an Ubuntu live disk from Mac
+
+Visit [this link](http://www.ubuntu.com/download/desktop/create-a-usb-stick-on-mac-osx) for all the instructions on how to create an Ubuntu live disk.
+
+## Installing from Live disk
+
+Now that you have your Live Disk USB key, we will install the Ubuntu Core image after booting that Live Disk.
+
+### Preparing the NUC (if using internal ROM as disk)
+> Note that this step is only necessary in case you want to install Ubuntu Core on the 4GB eMMC Built-In Storage.
+If you wired an ssd disk to your NUC, this section can be skipped.
+1. Start your NUC by pressing the On button while pressing F2 during the boot up, this will open the BIOS settings.
+1. On the initial screen, access the "advanced" tab and press to access the "Devices and Peripherals" Tab.
+1. On the "Devices and Peripherals" menu, under the "On board devices" submenu, make sure that the emmc checkbox ("4GB emmc Built-in Storage") is checked.
+  > If you didn't find this option, this means that you need to update your NUC BIOS to latest version. For this, you can follow online instructions on the [Intel website](http://www.intel.com/content/www/us/en/support/boards-and-kits/000005850.html).
+1. In the "Boot" menu, "Secure boot" submenu, make sure that the "secure boot" is not checked.
+
+
+### Booting from the Live CD
+
+1. Insert the USB key with the Ubuntu live distribution
+1. Start you Intel® NUC and push **F10** to enter the boot menu.
+1. Select the USB key as boot option.
+1. Choose **"Try Ubuntu without installing”**.
+
+### Installing Ubuntu Core onto your Intel® NUC
+
+Once the Live distro is running, open a terminal with the key combination Ctrl+Alt+t.
+
+1. Start by **downloading the Ubuntu Core image** for Intel® NUC in your current folder.
+```sh
+wget http://people.canonical.com/~platform/snappy/ubuntu-core-15.04-intel-nuc.img.xz
+```
+Once the download is finished, you’ll have a zip file named ubuntu-core-15.04-intel-nuc.img.xz.
+
+1. **Copy your downloaded image to the disk**. You must specify the path to the disk device representing your disk in the dd command below. Common device paths for the ssd disks are of the form **/dev/sdX** (such as **/dev/sda**, not /dev/sda1!). Please note that if you want to use the eMMC instead of an internal ssd drive, replace **/dev/sdX** by **/dev/mmcblk0** which refers to the eMMC option.
+
+```sh
+xzcat ubuntu-core-15.04-intel-nuc.img.xz | sudo dd of=/dev/sdX bs=32M
+sync
+```
+
+ > Note that this operation length can vary depending on your disk speed. There is no progress displayed unless you send SIGINFO signal pressing Ctrl+T.
+
+1. ​You can now **reboot** your Intel® NUC
+
+## First boot to Ubuntu Core 16.04
+
+> Note that the first boot can be longer than usual as your primary disk is repartioned to take all available free space.
+
+Power on your Intel® NUC and wait a couple of minutes for the OS to complete its first boot.
+
+You can then access your snappy Ubuntu Core system by loading the webdm interface from your browser. Just point it to
+http://webdm.local:4200.
+
+![Webdm vanilla interface](https://raw.githubusercontent.com/ubuntu-core/snappy-dev-website/master/src/img/setup/webdm.png)
+
+<<ADDITIONAL_FIRST_BOOT_NOTES>>
+
+Congrats, you just installed your new Snappy Ubuntu Core 16.04 system. It's now time to explore it and
+install some snaps to it!

=== added file 'md_importer/tests/data/website-test/out/get-started/as-dev/16.04/step2-setup-intel-nuc-ubuntu.md'
--- md_importer/tests/data/website-test/out/get-started/as-dev/16.04/step2-setup-intel-nuc-ubuntu.md	1970-01-01 00:00:00 +0000
+++ md_importer/tests/data/website-test/out/get-started/as-dev/16.04/step2-setup-intel-nuc-ubuntu.md	2016-03-22 10:52:56 +0000
@@ -0,0 +1,73 @@
+# Setting up your Intel® NUC
+
+![Intel® NUC image](https://raw.githubusercontent.com/ubuntu-core/snappy-dev-website/master/src/img/devices/Thin_Canyon_NUC_Front_Angle_Board.png "Intel® NUC image")
+
+Installing Snappy Ubuntu Core on your Intel® NUC, only takes 3 steps and a 2G USB key:
+1. Install a live version of Ubuntu Classic on a USB key.
+1. Boot on your Intel® NUC from the live USB key.
+1. Install Ubuntu Core onto Intel® NUC disk from the live session.
+And you can get started with your project!
+
+> Make sure your board is connected to the same network as your computer to manage Ubuntu Core remotely via SSH, or has a screen and keyboard attached if you prefer managing Ubuntu Core directly on the board.
+
+## Create an Ubuntu live disk from Ubuntu
+
+Visit [this link](http://www.ubuntu.com/download/desktop/create-a-usb-stick-on-ubuntu) for all the instructions on how to create an Ubuntu live disk.
+
+## Installing from Live disk
+
+Now that you have your Live Disk USB key, we will install the Ubuntu Core image after booting that Live Disk.
+
+### Preparing the NUC (if using internal ROM as disk)
+> Note that this step is only necessary in case you want to install Ubuntu Core on the 4GB eMMC Built-In Storage.
+If you wired an ssd disk to your NUC, this section can be skipped.
+1. Start your NUC by pressing the On button while pressing F2 during the boot up, this will open the BIOS settings.
+1. On the initial screen, access the "advanced" tab and press to access the "Devices and Peripherals" Tab.
+1. On the "Devices and Peripherals" menu, under the "On board devices" submenu, make sure that the emmc checkbox ("4GB emmc Built-in Storage") is checked.
+  > If you didn't find this option, this means that you need to update your NUC BIOS to latest version. For this, you can follow online instructions on the [Intel website](http://www.intel.com/content/www/us/en/support/boards-and-kits/000005850.html).
+1. In the "Boot" menu, "Secure boot" submenu, make sure that the "secure boot" is not checked.
+
+
+### Booting from the Live CD
+
+1. Insert the USB key with the Ubuntu live distribution
+1. Start you Intel® NUC and push **F10** to enter the boot menu.
+1. Select the USB key as boot option.
+1. Choose **"Try Ubuntu without installing”**.
+
+### Installing Ubuntu Core onto your Intel® NUC
+
+Once the Live distro is running, open a terminal with the key combination Ctrl+Alt+t.
+
+1. Start by **downloading the Ubuntu Core image** for Intel® NUC in your current folder.
+```sh
+wget http://people.canonical.com/~platform/snappy/ubuntu-core-15.04-intel-nuc.img.xz
+```
+Once the download is finished, you’ll have a zip file named ubuntu-core-15.04-intel-nuc.img.xz.
+
+1. **Copy your downloaded image to the disk**. You must specify the path to the disk device representing your disk in the dd command below. Common device paths for the ssd disks are of the form **/dev/sdX** (such as **/dev/sda**, not /dev/sda1!). Please note that if you want to use the eMMC instead of an internal ssd drive, replace **/dev/sdX** by **/dev/mmcblk0** which refers to the eMMC option.
+
+```sh
+xzcat ubuntu-core-15.04-intel-nuc.img.xz | sudo dd of=/dev/sdX bs=32M
+sync
+```
+
+ > Note that this operation length can vary depending on your disk speed. There is no progress displayed unless you send SIGINFO signal pressing Ctrl+T.
+
+1. ​You can now **reboot** your Intel® NUC
+
+## First boot to Ubuntu Core 16.04
+
+> Note that the first boot can be longer than usual as your primary disk is repartioned to take all available free space.
+
+Power on your Intel® NUC and wait a couple of minutes for the OS to complete its first boot.
+
+You can then access your snappy Ubuntu Core system by loading the webdm interface from your browser. Just point it to
+http://webdm.local:4200.
+
+![Webdm vanilla interface](https://raw.githubusercontent.com/ubuntu-core/snappy-dev-website/master/src/img/setup/webdm.png)
+
+<<ADDITIONAL_FIRST_BOOT_NOTES>>
+
+Congrats, you just installed your new Snappy Ubuntu Core 16.04 system. It's now time to explore it and
+install some snaps to it!

=== added file 'md_importer/tests/data/website-test/out/get-started/as-dev/16.04/step2-setup-intel-nuc-windows.md'
--- md_importer/tests/data/website-test/out/get-started/as-dev/16.04/step2-setup-intel-nuc-windows.md	1970-01-01 00:00:00 +0000
+++ md_importer/tests/data/website-test/out/get-started/as-dev/16.04/step2-setup-intel-nuc-windows.md	2016-03-22 10:52:56 +0000
@@ -0,0 +1,73 @@
+# Setting up your Intel® NUC
+
+![Intel® NUC image](https://raw.githubusercontent.com/ubuntu-core/snappy-dev-website/master/src/img/devices/Thin_Canyon_NUC_Front_Angle_Board.png "Intel® NUC image")
+
+Installing Snappy Ubuntu Core on your Intel® NUC, only takes 3 steps and a 2G USB key:
+1. Install a live version of Ubuntu Classic on a USB key.
+1. Boot on your Intel® NUC from the live USB key.
+1. Install Ubuntu Core onto Intel® NUC disk from the live session.
+And you can get started with your project!
+
+> Make sure your board is connected to the same network as your computer to manage Ubuntu Core remotely via SSH, or has a screen and keyboard attached if you prefer managing Ubuntu Core directly on the board.
+
+## Create an Ubuntu live disk from Windows
+
+Visit [this link](http://www.ubuntu.com/download/desktop/create-a-usb-stick-on-windows) for all the instructions on how to create an Ubuntu live disk.
+
+## Installing from Live disk
+
+Now that you have your Live Disk USB key, we will install the Ubuntu Core image after booting that Live Disk.
+
+### Preparing the NUC (if using internal ROM as disk)
+> Note that this step is only necessary in case you want to install Ubuntu Core on the 4GB eMMC Built-In Storage.
+If you wired an ssd disk to your NUC, this section can be skipped.
+1. Start your NUC by pressing the On button while pressing F2 during the boot up, this will open the BIOS settings.
+1. On the initial screen, access the "advanced" tab and press to access the "Devices and Peripherals" Tab.
+1. On the "Devices and Peripherals" menu, under the "On board devices" submenu, make sure that the emmc checkbox ("4GB emmc Built-in Storage") is checked.
+  > If you didn't find this option, this means that you need to update your NUC BIOS to latest version. For this, you can follow online instructions on the [Intel website](http://www.intel.com/content/www/us/en/support/boards-and-kits/000005850.html).
+1. In the "Boot" menu, "Secure boot" submenu, make sure that the "secure boot" is not checked.
+
+
+### Booting from the Live CD
+
+1. Insert the USB key with the Ubuntu live distribution
+1. Start you Intel® NUC and push **F10** to enter the boot menu.
+1. Select the USB key as boot option.
+1. Choose **"Try Ubuntu without installing”**.
+
+### Installing Ubuntu Core onto your Intel® NUC
+
+Once the Live distro is running, open a terminal with the key combination Ctrl+Alt+t.
+
+1. Start by **downloading the Ubuntu Core image** for Intel® NUC in your current folder.
+```sh
+wget http://people.canonical.com/~platform/snappy/ubuntu-core-15.04-intel-nuc.img.xz
+```
+Once the download is finished, you’ll have a zip file named ubuntu-core-15.04-intel-nuc.img.xz.
+
+1. **Copy your downloaded image to the disk**. You must specify the path to the disk device representing your disk in the dd command below. Common device paths for the ssd disks are of the form **/dev/sdX** (such as **/dev/sda**, not /dev/sda1!). Please note that if you want to use the eMMC instead of an internal ssd drive, replace **/dev/sdX** by **/dev/mmcblk0** which refers to the eMMC option.
+
+```sh
+xzcat ubuntu-core-15.04-intel-nuc.img.xz | sudo dd of=/dev/sdX bs=32M
+sync
+```
+
+ > Note that this operation length can vary depending on your disk speed. There is no progress displayed unless you send SIGINFO signal pressing Ctrl+T.
+
+1. ​You can now **reboot** your Intel® NUC
+
+## First boot to Ubuntu Core 16.04
+
+> Note that the first boot can be longer than usual as your primary disk is repartioned to take all available free space.
+
+Power on your Intel® NUC and wait a couple of minutes for the OS to complete its first boot.
+
+You can then access your snappy Ubuntu Core system by loading the webdm interface from your browser. Just point it to
+http://webdm.local:4200.
+
+![Webdm vanilla interface](https://raw.githubusercontent.com/ubuntu-core/snappy-dev-website/master/src/img/setup/webdm.png)
+
+<<ADDITIONAL_FIRST_BOOT_NOTES>>
+
+Congrats, you just installed your new Snappy Ubuntu Core 16.04 system. It's now time to explore it and
+install some snaps to it!

=== added file 'md_importer/tests/data/website-test/out/get-started/as-dev/16.04/step2-setup-rpi2-macos.md'
--- md_importer/tests/data/website-test/out/get-started/as-dev/16.04/step2-setup-rpi2-macos.md	1970-01-01 00:00:00 +0000
+++ md_importer/tests/data/website-test/out/get-started/as-dev/16.04/step2-setup-rpi2-macos.md	2016-03-22 10:52:56 +0000
@@ -0,0 +1,74 @@
+# Setting up your Raspberry Pi 2
+
+![Raspberry Pi 2 image](https://raw.githubusercontent.com/ubuntu-core/snappy-dev-website/master/src/img/devices/raspberry-pi.png "Raspberry Pi 2 image")
+
+From your desktop computer, you can download and install a pre-built Snappy Ubuntu Core 16.04 image for your Raspberry Pi 2 and copy it to an SD card. You can then get started with your project!
+
+> Make sure your board is connected to the same network as your computer to manage Ubuntu Core remotely via SSH, or has a screen and keyboard attached if you prefer managing Ubuntu Core directly on the board.
+
+## Downloading and installing
+
+1. Start by **downloading the Ubuntu Core image** for Raspberry Pi 2 in your current folder.
+```sh
+curl -O http://people.canonical.com/~mvo/all-snaps/rpi2-all-snap.img.xz
+```
+
+1. **Extract** the downloaded zip file into your Downloads folder by double clicking on it. You should now have an uncompressed file named rpi2-all-snap.img.
+> You might have to install archive extractor software, like [The Unarchiver](https://itunes.apple.com/gb/app/the-unarchiver/id425424353?mt=12) or similar as the standard tools do not support xz
+
+1. **Insert your SD card**. Ensure there is no data you care about on the SD card before running the commands below.
+
+1. **Determine which disk to write to and inmount it**.
+ * Run
+```sh
+diskutil list
+```
+ In the results identify your SD card, it will probably an entry like the one below:
+```sh
+/dev/disk0
+  #:                       TYPE NAME                    SIZE       IDENTIFIER
+  0:      GUID_partition_scheme                        *500.3 GB   disk0
+/dev/disk2
+  #:                       TYPE NAME                    SIZE       IDENTIFIER
+  0:                  Apple_HFS Macintosh HD           *428.8 GB   disk1
+                                Logical Volume on disk0s2
+                                E2E7C215-99E4-486D-B3CC-DAB8DF9E9C67
+                                Unlocked Encrypted
+/dev/disk3
+  #:                       TYPE NAME                    SIZE       IDENTIFIER
+  0:     FDisk_partition_scheme                        *7.9 GB     disk3
+  1:                 DOS_FAT_32 NO NAME                 7.9 GB     disk3s1
+```
+ > Note that your SD Card must be DOS_FAT_32 formatted. The SIZE will be the size of your SD card, in this example an 8GB SD Card.
+
+ Write down the number after /dev/disk that is associated with your SD card, in this case 3.
+
+ * Unmount your SD card by entering the command:
+ `diskutil unmountDisk /dev/diskX` where X is the number you just wrote down. When successful you should see a message similar to this one: *Unmount of all volumes on diskX was successful*.
+
+1. **Copy your downloaded image to the SD card**. Note that you need to specify the path to the disk device with the number you just wrote down in previous step.
+```sh
+sudo dd if=~/Downloads/rpi2-all-snap.img of=/dev/diskX bs=32MB
+sync
+```
+You will be prompted to enter your Apple password after this command.
+
+ > Note that this operation length can vary depending on your SD card speed. There is no progress displayed unless you send SIGINFO signal pressing Ctrl+T.
+
+1. **Eject** the SD card physically from your Mac and **insert it** in your Raspberry Pi 2.
+
+## First boot to Ubuntu Core 16.04
+
+> Note that the first boot can be longer than usual as your primary disk is repartioned to take all available free space.
+
+Power on your Raspberry Pi 2 and wait a couple of minutes for the OS to complete its first boot.
+
+You can then access your snappy Ubuntu Core system by loading the webdm interface from your browser. Just point it to
+http://webdm.local:4200.
+
+![Webdm vanilla interface](https://raw.githubusercontent.com/ubuntu-core/snappy-dev-website/master/src/img/setup/webdm.png)
+
+<<ADDITIONAL_FIRST_BOOT_NOTES>>
+
+Congrats, you just installed your new Snappy Ubuntu Core 16.04 system. It's now time to explore it and
+install some snaps to it!

=== added file 'md_importer/tests/data/website-test/out/get-started/as-dev/16.04/step2-setup-rpi2-ubuntu.md'
--- md_importer/tests/data/website-test/out/get-started/as-dev/16.04/step2-setup-rpi2-ubuntu.md	1970-01-01 00:00:00 +0000
+++ md_importer/tests/data/website-test/out/get-started/as-dev/16.04/step2-setup-rpi2-ubuntu.md	2016-03-22 10:52:56 +0000
@@ -0,0 +1,46 @@
+# Setting up your Raspberry Pi 2
+
+![Raspberry Pi 2 image](https://raw.githubusercontent.com/ubuntu-core/snappy-dev-website/master/src/img/devices/raspberry-pi.png "Raspberry Pi 2 image")
+
+From your desktop computer, you can download and install a pre-built Snappy Ubuntu Core 16.04 image for your Raspberry Pi 2 and copy it to an SD card. You can then get started with your project!
+
+> Make sure your board is connected to the same network as your computer to manage Ubuntu Core remotely via SSH, or has a screen and keyboard attached if you prefer managing Ubuntu Core directly on the board.
+
+## Downloading and installing
+
+1. Start by **downloading the Ubuntu Core image** for Raspberry Pi 2 in your current folder.
+```sh
+wget http://people.canonical.com/~mvo/all-snaps/rpi2-all-snap.img.xz
+```
+Once the download is finished, you’ll have a zip file named rpi2-all-snap.img.xz.
+
+1. **Insert your SD card**. Ensure there is no data you care about on the SD card before performing next steps below.
+
+1. **Unmount it**: if your SD card is mounted when you insert it into your computer (you will know it if the file manager automatically opens a window showing the card's contents), you must manually unmount it before writing the snappy image to it. Either eject your SD card from the file manager, or from the command line: `sudo umount /media/$USER/`
+
+1. **Copy your downloaded image to the SD card**. You must specify the path to the disk device representing your SD card in the dd command below. Common device paths for the SD card disk device are either of the form **/dev/sdX** (such as **/dev/sdb**, not /dev/sdb1!) or **/dev/mmcblk0** (not /dev/mmcblk0p1!)
+```sh
+xzcat rpi2-all-snap.img.xz | sudo dd of=/dev/sdX bs=32M
+sync
+```
+ You will be prompted to enter your password after this command.
+
+ > Note that this operation length can vary depending on your SD card speed. There is no progress displayed unless you send SIGINFO signal pressing Ctrl+T.
+
+1. **Eject** the SD card physically from your PC and **insert it** in your Raspberry Pi 2.
+
+## First boot to Ubuntu Core 16.04
+
+> Note that the first boot can be longer than usual as your primary disk is repartioned to take all available free space.
+
+Power on your Raspberry Pi 2 and wait a couple of minutes for the OS to complete its first boot.
+
+You can then access your snappy Ubuntu Core system by loading the webdm interface from your browser. Just point it to
+http://webdm.local:4200.
+
+![Webdm vanilla interface](https://raw.githubusercontent.com/ubuntu-core/snappy-dev-website/master/src/img/setup/webdm.png)
+
+<<ADDITIONAL_FIRST_BOOT_NOTES>>
+
+Congrats, you just installed your new Snappy Ubuntu Core 16.04 system. It's now time to explore it and
+install some snaps to it!

=== added file 'md_importer/tests/data/website-test/out/get-started/as-dev/16.04/step2-setup-rpi2-windows.md'
--- md_importer/tests/data/website-test/out/get-started/as-dev/16.04/step2-setup-rpi2-windows.md	1970-01-01 00:00:00 +0000
+++ md_importer/tests/data/website-test/out/get-started/as-dev/16.04/step2-setup-rpi2-windows.md	2016-03-22 10:52:56 +0000
@@ -0,0 +1,50 @@
+# Setting up your Raspberry Pi 2
+
+![Raspberry Pi 2 image](https://raw.githubusercontent.com/ubuntu-core/snappy-dev-website/master/src/img/devices/raspberry-pi.png "Raspberry Pi 2 image")
+
+From your desktop computer, you can download and install a pre-built Snappy Ubuntu Core 16.04 image for your Raspberry Pi 2 and copy it to an SD card. You can then get started with your project!
+
+> Make sure your board is connected to the same network as your computer to manage Ubuntu Core remotely via SSH, or has a screen and keyboard attached if you prefer managing Ubuntu Core directly on the board.
+
+## Downloading and installing
+
+1. Start by **downloading the Ubuntu Core image** for Raspberry Pi 2 in your **Downloads** folder from [this link](http://people.canonical.com/~mvo/all-snaps/rpi2-all-snap.img.xz).
+Once the download is finished, you’ll have a zip file named rpi2-all-snap.img.xz.
+
+1. **Extract** the downloaded zip file into your Downloads folder. You should now have an uncompressed file named rpi2-all-snap.img.
+> You might have to install archive extractor software, like [7-zip](http://www.7-zip.org/) or similar as the standard tools do not support xz
+
+1. **Insert your SD card**. Ensure there is no data you care about on the SD card before performing next steps below.
+
+1. **Copy your downloaded image to the SD card**. Install and launch [Win32DiskImager](http://sourceforge.net/projects/win32diskimager/files/latest/download).
+ > Find out where what drive your SD card is mounted to. Open a File Explorer window to check which drive your SD card is listed under.  Here is an example of a card listed under **E:** and the setup in Diskimager.
+
+ ![Windows drives](https://raw.githubusercontent.com/ubuntu-core/snappy-dev-website/master/src/img/setup/windows-drives.png)
+
+  Win32DiskImager will need 2 elements:
+   * *An Image File* which is the file you want to copy on your SD Card. Navigate to your *Downloads* folder and select the rpi2-all-snap.img image you have just extracted.
+   * *A Device* which is the location of your SD card. Select the Drive in which your SD card is mounted.
+
+   ![Win32DiskImager image selection](https://raw.githubusercontent.com/ubuntu-core/snappy-dev-website/master/src/img/setup/windows-diskimager-setup.png)
+
+  > To be safe, unplug every External USB Drive you may have connected to your PC.
+
+  When ready click on Write and wait for the process to complete.
+
+1. Exit from Win32DiskImager. **Eject** the SD card from the File Explorer window and **insert it** in your Raspberry Pi 2.
+
+## First boot to Ubuntu Core 16.04
+
+> Note that the first boot can be longer than usual as your primary disk is repartioned to take all available free space.
+
+Power on your Raspberry Pi 2 and wait a couple of minutes for the OS to complete its first boot.
+
+You can then access your snappy Ubuntu Core system by loading the webdm interface from your browser. Just point it to
+http://webdm.local:4200.
+
+![Webdm vanilla interface](https://raw.githubusercontent.com/ubuntu-core/snappy-dev-website/master/src/img/setup/webdm.png)
+
+<<ADDITIONAL_FIRST_BOOT_NOTES>>
+
+Congrats, you just installed your new Snappy Ubuntu Core 16.04 system. It's now time to explore it and
+install some snaps to it!

=== added file 'md_importer/tests/data/website-test/out/get-started/as-dev/16.04/step3-get-familiar.md'
--- md_importer/tests/data/website-test/out/get-started/as-dev/16.04/step3-get-familiar.md	1970-01-01 00:00:00 +0000
+++ md_importer/tests/data/website-test/out/get-started/as-dev/16.04/step3-get-familiar.md	2016-03-22 10:52:56 +0000
@@ -0,0 +1,212 @@
+# Install your first snap package!
+
+It is now time to transform your Snappy Ubuntu Core system in an awesome arcade game machine!
+You can easily install any snap through the webdm store UI.
+
+> If you retrieved the ip in the previous step, replace **webdm.local** by the **ip address** you noted before.
+
+## The webdm store
+
+Ensure you have a tab opened on the **Snappy store** tab
+or visit directly http://webdm.local:4200/store.
+
+![Webdm store](https://raw.githubusercontent.com/ubuntu-core/snappy-dev-website/master/src/img/setup/webdm-store.png)
+
+You will see there all available snaps for your release version. Note that the store can be branded differently and
+have access to all or partial snaps list depending on the device you are playing with. This configuration is available
+to board makers when then enable a new device with Snappy Ubuntu Core.
+
+## Install snake!
+
+Let's try to install your first package by simply clicking on **Install** next to *snake*. Once this is done, open a new
+browser tab and head over http://webdm.local:9999/.
+
+![Snake snap](https://raw.githubusercontent.com/ubuntu-core/snappy-dev-website/master/src/img/first-snap-snake.png)
+
+It's high time for you to perform new ground breaking records!
+
+Installing (and removing) new snaps is that easy! Extend your system in a breath and get your router to perform your home
+backups, monitoring and even regulating your average home temperature!
+
+Of course, we have options for having this preinstalled when building a factory image and there is also a command line tool
+available to perform similar operations.
+
+# Getting a shell access to your board
+
+You can then access your snappy Ubuntu Core system either directly with a keyboard and display connected, or through SSH:
+```sh
+ssh [e-mail]
+```
+
+The default *password* is **ubuntu**.
+
+As soon as you get a prompt similar to `[e-mail]:~$`, you are good to go!
+
+> Note that if you have multiple Ubuntu Core systems on the same network, the webdm.local aliases can conflict.
+In that case, you need to retrieve the ip address of the machine by connecting the keyboard/display combo to it.
+Once logged in, just use: `ifconfig` and note the ip address. You can then connect to your board via `sh ubuntu@<ip_address>`.
+
+# Basic instructions for snappy as a developer
+
+Let's dive into your Ubuntu Core system and see how it feels to get things done the Snappy way!
+
+You need to be logged in to your Ubuntu Core instance to try these commands, they won't work on a traditional apt-get or
+deb-based Ubuntu system!
+
+## Differences with a traditional Ubuntu distribution
+
+### Read-only system
+
+Let's check that most of system files (apart from user and snaps data) are read-only, which is what ensure integrity on your system.
+
+```sh
+$ sudo touch /foo
+touch: cannot touch '/foo': Read-only file system
+```
+
+-> we couldn't write in **/** even as root (sudo)!
+
+### No apt-get or debs installs
+
+Ubuntu Core is based on the traditional Ubuntu system, deb-based. However, we don't let in the main partition apt and debs
+mixed with snaps, as this will break our transaction and updates story.
+```sh
+$ apt-get update
+Ubuntu Core does not use apt-get, see 'snappy --help'!
+$ dpkg -l
+dpkg: error: unable to execute dpkg-query (dpkg-query): No such file or directory
+```
+
+## Version, channels and default installed snaps
+
+We interact with Ubuntu Core via the **snappy** command. Let's check which version of Ubuntu Core we are on:
+```sh
+$ snappy info
+release: core/16.04/stable
+architecture: amd64
+apps: snake
+```
+
+This is a pristine system, freshly installed with only the snake apps installed. The "release" tells you that you are running
+the latest Ubuntu Core's stable release, which is the recommended [image channel](https://developer.ubuntu.com/en/snappy/guides/channels/)
+for starting with Snappy.
+
+Let's see which snaps are installed:
+```sh
+$ snappy list
+Name                 Date       Version      Developer
+canonical-pc         2016-02-02 3.0          canonical
+canonical-pc-linux   2016-02-22 4.4.0-6-1    canonical
+ubuntu-core          2016-03-08 16.04.0-24   canonical
+snake                2016-02-17 1.0          mectors
+```
+
+Each systems have at least 3 snaps installed (the first 3 in our list):
+* The base system layer (ubuntu-core)
+* The kernel snap (canonical-pc-linux)
+* The gadget snap, with some specific configuration to your device (canonical-pc)
+
+## Updating your system
+
+The good news is that the system will update in the background and reboot automatically! You can easily see if updates
+are available via:
+```sh
+$ snappy list -u
+Name                 Date       Version
+canonical-pc         2016-02-02 3.0
+ubuntu-core*         2016-03-08 16.04.0-24
+snake                2016-02-17 1.0          mectors
+```
+
+Do you note (*) next to ubuntu-core? This means a new update is available and that the kernel is probably already downloading on your system!
+
+You will simply run it once it's downloaded (the message `Reboot to use ubuntu-core version 16.04.0-25` would appear on
+any `snappy list` command) and after performing a reboot (`sudo reboot`). You can check using the verbose list mode that
+two base system snaps are present on the system:
+```sh
+$ snappy list -v
+Name                 Date       Version      Developer
+canonical-pc         2016-02-02 3.0          canonical*
+canonical-pc-linux   2016-02-22 4.4.0-6-1    canonical*
+ubuntu-core          2016-03-08 16.04.0-24   canonical
+ubuntu-core          2016-03-09 16.04.0-25   canonical*
+snake                2016-02-17 1.0          mectors*
+```
+
+The active flag (*) tells you that this version of the component is what is currently running. Here ubuntu-core 16.04.0-25. Only one snap of a given name can be active at a time. Older snap versions are garbage collected after a while.
+
+## Installing a package from the store
+
+It's time to search and install a second app snaps from the store!
+```sh
+$ snap find hello
+Name           Version   Summary
+hello-dbus-app.canonical 1.0.2   hello-dbus-app
+hello-dbus-fwk.canonical 1.0.2   hello-dbus-fwk
+hello-world.canonical    16.04-3 hello-world
+hello-world.elopio       1.0.20  hello-world
+hello-world.mvo          2.0     hello-world
+```
+
+Let's install the canonical one:
+```sh
+$ sudo snap install hello-world.canonical
+```
+
+The **hello-world** snap is now part of this system!
+
+## Running snap-provided command on your system
+
+Contrary to the **snake** snap, which provided a service app activated at boot, the **hello-world** snap provides multiple commands. Those are available under the *<snap_package>.<command_name>* scheme.
+
+For instance, let's run the *echo* command:
+```sh
+$ hello-world.echo
+Hello World!
+```
+
+It works! Remember that one of the key concepts of Snappy Ubuntu Core is security, and that snaps can't have access to the whole system and perform evil actions:
+```sh
+$ hello-world.evil
+Hello Evil World!
+This example demonstrates the app confinement
+You should see a permission denied error next
+/snaps/hello-world.canonical/5.0/bin/evil: 9: /snaps/hello-world.canonical/5.0/bin/evil: cannot create /var/tmp/myevil.txt: Permission denied
+```
+
+Phew, that was close! Finally, let's check which environments variables are accessible to our snap commands:
+```sh
+$ hello-world.env | grep SNAP
+SNAP_APP_PATH=/snaps/hello-world.canonical/5.0
+SNAP_ORIGIN=canonical
+SNAP_APP_USER_DATA_PATH=/home/ubuntu/snaps/hello-world.canonical/5.0
+SNAP_FULLNAME=hello-world.canonical
+SNAP_USER_DATA=/home/ubuntu/snaps/hello-world.canonical/5.0
+SNAP_DATA=/var/lib/snaps/hello-world.canonical/5.0
+SNAPP_APP_TMPDIR=/tmp
+SNAP_NAME=hello-world
+SNAP_APP_TMPDIR=/tmp
+SNAP_OLD_PWD=/home/ubuntu
+SNAP_ARCH=amd64
+SNAP_VERSION=5.0
+SNAP=/snaps/hello-world.canonical/5.0
+SNAP_DATA=/var/lib/snaps/hello-world.canonical/5.0
+```
+
+**SNAP_DATA** and **SNAP_USER_DATA** are the writable directories for your snaps. Your application and services will always start with **SNAP_DATA** as your current directory.
+
+> Note that those variables are versioned. When you update your snap, the content will be **copied** under a new directory. This is what enables the `snap rollback` functionality, ensuring that you get back to an older version without having to care about data format compatibility!
+
+## Uninstalling an snap
+
+Unsurprisingly, removing a snap is just:
+```sh
+$ sudo snap remove hello-world.canonical
+```
+
+This removes this snap and all older snaps
+
+> Note that this doesn't remove snap associated data that we previously mentioned. It means you can reinstall your snap and get access to the same data! `sudo snap purge hello-world.canonical` will though.
+
+You are now an expert developer on Snappy Ubuntu Core! It's now time to get to the most interesting
+part for you: building and testing your own first snap package!

=== added file 'md_importer/tests/data/website-test/out/get-started/as-dev/16.04/step4-first-snap.md'
--- md_importer/tests/data/website-test/out/get-started/as-dev/16.04/step4-first-snap.md	1970-01-01 00:00:00 +0000
+++ md_importer/tests/data/website-test/out/get-started/as-dev/16.04/step4-first-snap.md	2016-03-22 10:52:56 +0000
@@ -0,0 +1,8 @@
+# This is how to setup your dev environment with snapcraft
+
+Enable classic mode
+installing snapcraft on it and such…
+This part will be imported from snapcraft doc
+# This is how we build the first snap
+
+And this will be imported as well from snapcraft doc

=== added file 'md_importer/tests/data/website-test/out/get-started/as-dev/16.04/step5-further-readings.md'
--- md_importer/tests/data/website-test/out/get-started/as-dev/16.04/step5-further-readings.md	1970-01-01 00:00:00 +0000
+++ md_importer/tests/data/website-test/out/get-started/as-dev/16.04/step5-further-readings.md	2016-03-22 10:52:56 +0000
@@ -0,0 +1,3 @@
+# Awesome page for celebrating things!
+
+Bla bli blou

=== added file 'md_importer/tests/data/website-test/out/get-started/as-dev/index.html'
--- md_importer/tests/data/website-test/out/get-started/as-dev/index.html	1970-01-01 00:00:00 +0000
+++ md_importer/tests/data/website-test/out/get-started/as-dev/index.html	2016-03-22 10:52:56 +0000
@@ -0,0 +1,63 @@
+<div class="row no-border no-padding-bottom">
+<div class="twelve-col">
+<div class="twelve-col equal-height">
+<div class="two-col">
+<h4>I want to run</h4>
+</div>
+
+<div class="ten-col last-col"><select name="version"><option value="16-04">Latest Ubuntu Core (16.04)</option><option value="15-10">Ubuntu Core 15.10</option> </select></div>
+
+<div class="two-col">
+<h4>I am using:</h4>
+</div>
+
+<div class="two-col"><label><input checked="checked" name="host" type="radio" value="ubuntu" /> Ubuntu</label></div>
+
+<div class="two-col"><label><input name="host" type="radio" value="macos" /> Mac OS</label></div>
+
+<div class="two-col"><label><input name="host" type="radio" value="windows" /> Windows</label></div>
+</div>
+
+<div class="twelve-col">
+<h4>Ubuntu Core is supported on a wide variety on platform. We advise you to start with one of the following to get immediately the zen of the Ubuntu Core snappy experience!</h4>
+</div>
+
+<div class="twelve-col equal-height">
+<div class="three-col box"><label><input checked="checked" name="target" type="radio" value="rpi2" /> Raspberry Pi 2 (armhf)<br />
+<img src="http://i.imgur.com/sis6nSF.jpg" /> </label></div>
+
+<div class="three-col box"><label><input name="target" type="radio" value="intel-nuc" /> Intel NUC&trade; (amd64)<br />
+<img src="http://i.imgur.com/dgloAX6.jpg" /> </label></div>
+
+<div class="three-col box"><label><input name="target" type="radio" value="artik" /> Artik 5/Artik 10 (armhf)<br />
+<img src="http://i.imgur.com/YY4NxB2.jpg" /> </label></div>
+
+<div class="three-col box last-col"><label><input name="target" type="radio" value="dragonboard" /> DragonBoard (arm64)<br />
+<img src="http://i.imgur.com/YY4NxB2.jpg" /> </label></div>
+</div>
+
+<div class="twelve-col">
+<h4>We are also available on:</h4>
+</div>
+
+<div class="twelve-col equal-height">
+<div class="four-col box"><label><input name="target" type="radio" value="kvm" /> KVM (virtual machine)<br />
+<img src="http://i.imgur.com/sis6nSF.jpg" /> </label></div>
+
+<div class="four-col box"><label><input name="target" type="radio" value="bare-metal" /> Bare metal x86 devices<br />
+<img src="http://i.imgur.com/dgloAX6.jpg" /> </label></div>
+
+<div class="four-col box last-col"><label><input name="target" type="radio" value="beaglebone" /> BeagleBone<br />
+<img src="http://i.imgur.com/YY4NxB2.jpg" /> </label></div>
+
+<div class="four-col box"><label><input name="target" type="radio" value="azure" /> Microsoft Azure cloud<br />
+<img src="http://i.imgur.com/YY4NxB2.jpg" /> </label></div>
+
+<div class="four-col box"><label><input name="target" type="radio" value="gce" /> Google Cloud Engine<br />
+<img src="http://i.imgur.com/YY4NxB2.jpg" /> </label></div>
+
+<div class="four-col box last-col"><label><input name="target" type="radio" value="ecs" /> Amazon Elastic Compute Cloud<br />
+<img src="http://i.imgur.com/YY4NxB2.jpg" /> </label></div>
+</div>
+</div>
+</div>

=== modified file 'md_importer/tests/test_branch_import.py'
--- md_importer/tests/test_branch_import.py	2016-03-01 14:01:01 +0000
+++ md_importer/tests/test_branch_import.py	2016-03-22 10:52:56 +0000
@@ -4,8 +4,13 @@
 
 from cms.models import Page
 
+from md_importer.importer import (
+    DEFAULT_TEMPLATE,
+    TEMPLATE_CHOICES,
+)
 from md_importer.importer.article import Article
 from md_importer.importer.publish import find_text_plugin
+
 from .utils import TestLocalBranchImport
 
 
@@ -100,6 +105,38 @@
             self.assertIsNotNone(page.get_slug())
 
 
+class TestAdvertiseImport(TestLocalBranchImport):
+    '''Check if all imported articles are advertised in the navigation when
+       using defaults.'''
+    def runTest(self):
+        self.create_repo('data/snapcraft-test')
+        self.repo.add_directive('docs', '')
+        self.assertTrue(self.repo.execute_import_directives())
+        for article in self.repo.imported_articles:
+            self.assertTrue(article.advertise)
+        self.assertTrue(self.repo.publish())
+        for page in Page.objects.filter(publisher_is_draft=False):
+            if page.parent is not None:
+                self.assertEqual(page.parent_id, self.root.id)
+                self.assertTrue(page.in_navigation)
+
+
+class TestNoAdvertiseImport(TestLocalBranchImport):
+    '''Check if all imported articles are advertised in the navigation when
+       using defaults.'''
+    def runTest(self):
+        self.create_repo('data/snapcraft-test')
+        self.repo.add_directive('docs', '', advertise=False)
+        self.assertTrue(self.repo.execute_import_directives())
+        for article in self.repo.imported_articles:
+            self.assertFalse(article.advertise)
+        self.assertTrue(self.repo.publish())
+        for page in Page.objects.filter(publisher_is_draft=False):
+            if page.parent is not None:
+                self.assertEqual(page.parent_id, self.root.id)
+                self.assertFalse(page.in_navigation)
+
+
 class TestTwiceImport(TestLocalBranchImport):
     '''Run import on the same contents twice, make sure we don't
        add new pages over and over again.'''
@@ -150,3 +187,32 @@
             if page != self.root:
                 (dummy, plugin) = find_text_plugin(page)
                 self.assertGreater(now, plugin.changed_date)
+
+
+class TestImportNoTemplateChange(TestLocalBranchImport):
+    '''Check if all imported articles use the default template.'''
+    def runTest(self):
+        self.create_repo('data/snapcraft-test')
+        self.repo.add_directive('docs', '')
+        self.assertTrue(self.repo.execute_import_directives())
+        for article in self.repo.imported_articles:
+            self.assertEqual(article.template, DEFAULT_TEMPLATE)
+        self.assertTrue(self.repo.publish())
+        for page in Page.objects.filter(publisher_is_draft=False):
+            if page.parent is not None:
+                self.assertEqual(page.template, DEFAULT_TEMPLATE)
+
+
+class TestImportTemplateChange(TestLocalBranchImport):
+    '''Check if all imported articles use the desired template.'''
+    def runTest(self):
+        self.create_repo('data/snapcraft-test')
+        template_to_use = TEMPLATE_CHOICES[1][0]
+        self.repo.add_directive('docs', '', template=template_to_use)
+        self.assertTrue(self.repo.execute_import_directives())
+        for article in self.repo.imported_articles:
+            self.assertEqual(article.template, template_to_use)
+        self.assertTrue(self.repo.publish())
+        for page in Page.objects.filter(publisher_is_draft=False):
+            if page.parent is not None:
+                self.assertEqual(page.template, template_to_use)

=== modified file 'md_importer/tests/test_link_rewrite.py'
--- md_importer/tests/test_link_rewrite.py	2016-03-01 14:01:01 +0000
+++ md_importer/tests/test_link_rewrite.py	2016-03-22 10:52:56 +0000
@@ -2,6 +2,7 @@
 
 from cms.models import Page
 
+from ..importer import DEFAULT_LANG
 from ..importer.article import Article
 from .utils import (
     db_add_empty_page,
@@ -34,7 +35,9 @@
                 for link in soup.find_all('a'):
                     if not link.has_attr('class') or \
                        'headeranchor-link' not in link.attrs['class']:
-                        self.assertEqual(link.attrs['href'], '/file2')
+                        self.assertIn(
+                            link.attrs['href'],
+                            ['/file2', '/{}/file2/'.format(DEFAULT_LANG)])
 
 
 class TestLinkBrokenRewrite(TestLocalBranchImport):
@@ -70,7 +73,6 @@
         self.repo.add_directive('docs', 'snappy/build-apps/current')
         self.assertTrue(self.repo.execute_import_directives())
         self.assertTrue(self.repo.publish())
-        pages = Page.objects.all()
         for article in self.repo.imported_articles:
             self.assertTrue(isinstance(article, Article))
             self.assertGreater(len(article.html), 0)

=== added file 'md_importer/tests/test_website_import.py'
--- md_importer/tests/test_website_import.py	1970-01-01 00:00:00 +0000
+++ md_importer/tests/test_website_import.py	2016-03-22 10:52:56 +0000
@@ -0,0 +1,72 @@
+from md_importer.importer import DEFAULT_LANG
+from md_importer.importer.repo import Repo
+from .utils import (
+    db_add_empty_page,
+    TestLocalBranchImport,
+)
+
+from cms.api import add_plugin, publish_pages
+from cms.models import Page
+
+
+class TestSnappyWebsiteRead(TestLocalBranchImport):
+    def runTest(self):
+        self.create_repo('data/website-test')
+        self.assertTrue(isinstance(self.repo, Repo))
+        self.repo.add_directive('out/get-started/as-dev/index.html', '')
+        self.repo.add_directive('out/get-started/as-dev/16.04', '')
+        self.assertEqual(len(self.repo.directives), 2)
+        self.assertTrue(self.repo.execute_import_directives())
+        self.assertTrue(self.repo.publish())
+        self.assertGreater(len(self.repo.pages), 10)
+
+
+class TestSnappyWebsiteIA(TestLocalBranchImport):
+    def runTest(self):
+        self.create_repo('data/website-test')
+        snappy_page = db_add_empty_page('Snappy', self.root)
+        start = db_add_empty_page(
+            'Get started', parent=snappy_page, slug='start')
+        as_dev = db_add_empty_page(
+            'As developer', parent=start, slug='as-dev')
+        placeholder = as_dev.placeholders.all()[0]
+        add_plugin(placeholder, 'RawHtmlPlugin', DEFAULT_LANG, body='')
+        page_16_04 = db_add_empty_page(
+            '16.04', parent=as_dev, slug='16-04')
+        publish_pages([snappy_page, start, as_dev, page_16_04])
+        self.assertTrue(isinstance(self.repo, Repo))
+        self.repo.add_directive('out/get-started/as-dev/index.html',
+                                'snappy/start/as-dev')
+        self.repo.add_directive('out/get-started/as-dev/16.04/index.html',
+                                'snappy/start/as-dev/16-04')
+        self.repo.add_directive('out/get-started/as-dev/16.04',
+                                'snappy/start/as-dev/16-04')
+        self.assertTrue(self.repo.execute_import_directives())
+        self.assertTrue(self.repo.publish())
+        self.assertGreater(len(self.repo.pages), 10)
+        pages = Page.objects.filter(publisher_is_draft=False)
+        expected_urls = [
+            '/en/',
+            '/en/snappy/',
+            '/en/snappy/start/',
+            '/en/snappy/start/as-dev/',
+            '/en/snappy/start/as-dev/16-04/',
+            '/en/snappy/start/as-dev/16-04/step2-setup-beaglebone-macos/',
+            '/en/snappy/start/as-dev/16-04/step2-setup-beaglebone-ubuntu/',
+            '/en/snappy/start/as-dev/16-04/step2-setup-beaglebone-windows/',
+            '/en/snappy/start/as-dev/16-04/step2-setup-dragonboard-macos/',
+            '/en/snappy/start/as-dev/16-04/step2-setup-dragonboard-ubuntu/',
+            '/en/snappy/start/as-dev/16-04/step2-setup-dragonboard-windows/',
+            '/en/snappy/start/as-dev/16-04/step2-setup-intel-nuc-macos/',
+            '/en/snappy/start/as-dev/16-04/step2-setup-intel-nuc-ubuntu/',
+            '/en/snappy/start/as-dev/16-04/step2-setup-intel-nuc-windows/',
+            '/en/snappy/start/as-dev/16-04/step2-setup-rpi2-macos/',
+            '/en/snappy/start/as-dev/16-04/step2-setup-rpi2-ubuntu/',
+            '/en/snappy/start/as-dev/16-04/step2-setup-rpi2-windows/',
+            '/en/snappy/start/as-dev/16-04/step3-get-familiar/',
+            '/en/snappy/start/as-dev/16-04/step4-first-snap/',
+            '/en/snappy/start/as-dev/16-04/step5-further-readings/',
+        ]
+        self.assertEqual(len(expected_urls), len(pages))
+        for url in expected_urls:
+            self.assertTrue(url in [p.get_absolute_url() for p in pages])

=== modified file 'md_importer/tests/utils.py'
--- md_importer/tests/utils.py	2016-02-25 15:43:10 +0000
+++ md_importer/tests/utils.py	2016-03-22 10:52:56 +0000
@@ -27,9 +27,11 @@
     return db_add_empty_page('root')
 
 
-def db_add_empty_page(title, parent=None):
+def db_add_empty_page(title, parent=None, slug=None):
+    if not slug:
+        slug = slugify(title)
     page = create_page(
-        title, 'default.html', DEFAULT_LANG, slug=slugify(title),
+        title, 'default.html', DEFAULT_LANG, slug=slug,
         published=True, parent=parent)
     page.reload()
     page.publish(DEFAULT_LANG)

=== added file 'templates/snappy_hero_tour.html'
--- templates/snappy_hero_tour.html	1970-01-01 00:00:00 +0000
+++ templates/snappy_hero_tour.html	2016-03-22 10:52:56 +0000
@@ -0,0 +1,334 @@
+{% extends "cms_page_base.html" %}
+{% load cms_tags %}
+{% block nav_secondary %}
+{% endblock %}
+{% block content %}
+<div class="row last-col row--intro no-border text-center no-padding-bottom">
+    <div class="strip-inner-wrapper">
+        <div class="ubuntu-intro">
+            &nbsp;
+        </div>
+        <div class="eight-col">
+            <h3 class="left">Ubuntu Core's<br />
+            <strong>developer</strong> tour</h3>
+        </div>
+        <div class="four-col right last-col box" style="color: black;">
+            Completion time: 20 min
+        </div>
+    </div>
+</div>
+
+<div class="row equal-height row-grey" style="padding:0px;padding-top:20px;padding-bottom:20px;">
+
+    <div class="one-col no-margin-bottom">
+        &nbsp;
+    </div>
+
+    <div class="two-col center dot no-margin-bottom" style="text-align: center;"><a href="">
+            <div class="round-nav-circle">
+                1
+            </div>
+            <p>Pick up device</p>
+        </a>
+        <p class="eta">1 min</p>
+    </div>
+
+    <div class="two-col center dot no-margin-bottom" style="text-align: center;"><a href="">
+            <div class="round-nav-circle">
+                2
+            </div>
+            <p>Setup your board</p>
+        </a>
+        <p class="eta">7 min</p>
+    </div>
+
+    <div class="two-col center dot no-margin-bottom" style="text-align: center;"><a href="">
+            <div class="round-nav-circle">
+                3
+            </div>
+            <p>Get familiar with your new install</p>
+        </a>
+        <p class="eta">5 min</p>
+    </div>
+
+    <div class="two-col center dot no-margin-bottom" style="text-align: center;"><a href="">
+            <div class="round-nav-circle">
+                4
+            </div>
+            <p>Create your first snap</p>
+        </a>
+        <p class="eta">7 min</p>
+    </div>
+
+    <div class="two-col center dot last-dot no-margin-bottom" style="text-align: center;"><a href="">
+            <div class="round-nav-circle">
+                5
+            </div>
+            <p>Fireworks!</p>
+        </a>
+    </div>
+
+    <div class="one-col last-col no-margin-bottom">
+        &nbsp;
+    </div>
+
+    <div class="round-button" id="button-container-left">
+        <div class="round-button-circle">
+            <a id="prev" href="#" class="round-button">&lsaquo;</a>
+        </div>
+    </div>
+
+    <div class="round-button" id="button-container-right">
+        <div class="round-button-circle">
+            <a id="next" href="#" class="round-button">&rsaquo;</a>
+        </div>
+    </div>
+</div>
+
+{% placeholder page_content %}
+
+<script>
+    var path = "{{ request.path }}";
+    var nextBtn = document.getElementById('next');
+
+    // Remove next button on last page
+    if (path.includes("/step5")) {
+         document.getElementById("button-container-right").style.display = "none";
+    } 
+    else {
+        document.getElementById("button-container-right").style.display = "block";
+    }
+
+    // Set next button url
+    nextBtn.href = getChoicesString();
+
+    // Setup navigation dots
+    setDots()
+
+    // Dynamically update all nav urls to match user choices
+    if (!path.includes("/step")) {
+        var atags = document.getElementsByTagName('a');
+        for (var i = 0, length = atags.length; i < length; i++) { 
+            atags[i].addEventListener('mouseover', function () {
+                nextBtn.href = getChoicesString();
+                setDots();
+            });
+            atags[i].addEventListener('mousedown', function () {
+                nextBtn.href = getChoicesString();
+                setDots();
+            });
+        }
+    }
+
+    function setDots() {
+        var dots = document.getElementsByClassName("dot");
+        for (var i = 0, length = dots.length; i < length; i++) {
+            dots[i].firstChild.href = createURLForDot(dots.length, i + 1)
+            var short_path = path.split("/snappy/get-started/")[1];
+            var short_url = dots[i].firstChild.href.split("/snappy/get-started/")[1];
+            if (short_path == short_url.replace("#", "")) {
+                addClass(dots[i].firstChild.children[0], "here");
+                addClass(dots[i].firstChild.children[1], "here");
+            } else {
+                removeClass(dots[i].firstChild.children[0], "here");
+                removeClass(dots[i].firstChild.children[1], "here");
+            }
+        }
+    }
+
+    function createURLForDot(length, position) {
+        var host = getCookie("snappy-tour-host");
+        var version = getCookie("snappy-tour-version");
+        var target = getCookie("snappy-tour-target");
+        var url = "";
+        if (position == 1) {
+            if (path.includes("/step")) {
+                url = "..";
+            }
+            else {
+                url += "#";
+            }
+        }
+        else {
+            if (path.includes("/step")) {
+                url = "../step" + position + "-" + host + "-" + target + "/";
+            }
+            else {
+                url = version + "/step" + position + "-" + host + "-" + target + "/";
+            }
+        }
+        return url;
+    }
+
+    function getChoicesString() {
+        if (path.includes("/step")) {
+            page = path.split("/").reverse()[1];
+            current_step = page.split("-")[0];
+            next_step = current_step.replace(/(\d+)/, function () {
+                return arguments[1] * 1 + 1;
+            });
+            return "../" + page.replace(current_step, next_step);
+        }
+        else {
+            var step = "step2";
+            var host_item = document.getElementsByName('host');
+            var version_item = document.getElementsByName('version')[0].options;
+            var target_item = document.getElementsByName('target');
+
+            var version = version_item[version_item.selectedIndex].value;
+
+            for (var i = 0, length = host_item.length; i < length; i++) {
+                if (host_item[i].checked) {
+                    var host = host_item[i].value;
+                    break;
+                }
+            }
+
+            for (var i = 0, length = target_item.length; i < length; i++) {
+                if (target_item[i].checked) {
+                    var target = target_item[i].value;
+                    break;
+                }
+            }
+            setCookie("snappy-tour-version", version);
+            setCookie("snappy-tour-host", host);
+            setCookie("snappy-tour-target", target);
+            return version + "/" + step + "-" + host + "-" + target + "/";
+        }
+    }
+
+    // Utils
+
+    function setCookie(cname, cvalue) {
+        document.cookie = cname + "=" + cvalue + ";";
+    }
+
+    function getCookie(cname) {
+        var name = cname + "=";
+        var ca = document.cookie.split(';');
+        for (var i = 0; i < ca.length; i++) {
+            var c = ca[i];
+            while (c.charAt(0) == ' ') c = c.substring(1);
+            if (c.indexOf(name) == 0) return c.substring(name.length, c.length);
+        }
+        return "";
+    }
+
+    function hasClass(el, className) {
+      if (el.classList)
+        return el.classList.contains(className);
+      else
+        return !!el.className.match(new RegExp('(\\s|^)' + className + '(\\s|$)'));
+    }
+
+    function addClass(el, className) {
+      if (el.classList)
+        el.classList.add(className);
+      else if (!hasClass(el, className)) el.className += " " + className;
+    }
+
+    function removeClass(el, className) {
+      if (el.classList)
+        el.classList.remove(className);
+      else if (hasClass(el, className)) {
+        var reg = new RegExp('(\\s|^)' + className + '(\\s|$)');
+        el.className=el.className.replace(reg, ' ');
+      }
+    }
+</script>
+<style>
+#button-container-left {
+	position: absolute;
+	display:none;
+    top: 105px;
+    left:-24px;
+}
+
+#button-container-right {
+	position: absolute;
+	display:none;
+    top: 105px;
+    right:-24px;
+}
+
+.round-button {
+	width:64px;
+
+}
+.round-button-circle {
+	width: 100%;
+	height:0;
+	padding-bottom: 100%;
+    border-radius: 50%;
+	border:0px solid;
+    overflow:hidden;
+    
+    background: #dd4814; 
+    box-shadow: 0 0 10px gray;
+}
+.round-button-circle:hover {
+    background: #dd4814;
+}
+.round-button a {
+    display: block;
+    float: left;
+    width: 100%;
+    padding-top: 50%;
+    padding-bottom: 50%;
+    line-height: 3em;
+    margin-top: -1.57em;
+    text-align: center;
+    color: #e2eaf3;
+    font-size: 4em;
+    text-decoration: none;
+    padding-left: 0.02em;
+}
+.dot:before {
+    content: '';
+    position: absolute;
+    bottom: 73%;
+    width: 85%;
+    height: 0;
+    line-height: 0;
+    border-bottom: 2px dotted grey;
+    float: right;
+    left: 65%;
+}
+.last-dot:before {
+    width: 0;
+}
+.dot a {
+    color: #333;
+    text-decoration: none;
+}
+p.here {
+    font-weight:400;
+}
+.eta {
+    position: absolute;
+    top: 0px;
+    right: -20%;
+}
+.round-nav-circle {
+    width: 30px;
+    height: 30px;
+    border-radius: 100%;
+    border: 2px solid #333;
+    overflow: hidden;
+    background: transparent;
+    align-content: center;
+    line-height: 30px;
+    font-weight: 400;
+    font-size: 1.2em;
+    margin: auto;
+    margin-bottom: 8px;
+    margin-top:8px;
+}
+.round-nav-circle.here {
+    background: #dd4814;
+    color:#fff;
+}
+</style>
+{% endblock %}
+{% block footer %}
+{% endblock %}