Merge lp:~developer-ubuntu-com-dev/developer-ubuntu-com/soon-trunk into lp:developer-ubuntu-com

[Daniel Holbach]

This is an MP which bundles the changes in

 - lp:~developer-ubuntu-com-dev/developer-ubuntu-com/django-1.8-cms-2.3
 - lp:~dholbach/developer-ubuntu-com/rework-importer

and fixes issues because of changes which were backed out previously.

This should be reviewed and tested carefully by all of us.

[David Callé (davidc3)]

Thanks Daniel, I'll start testing today

[Daniel Holbach (dholbach)]

pip-cache needs an update to add pymdown-extensions (for markdown tables, fenced code blocks, etc.)

=== modified file 'Makefile'
--- Makefile	2016-01-12 14:24:40 +0000
+++ Makefile	2016-01-19 00:21:38 +0000
@@ -46,7 +46,7 @@
 
 syncdb:
 	@echo "Syncing database"
-	@python manage.py syncdb --noinput --migrate --settings charm_settings
+	@python manage.py migrate --noinput --settings charm_settings
 
 collectstatic: collectstatic.done
 collectstatic.done:
@@ -61,18 +61,18 @@
 update-pip-cache:
 	@echo "Updating pip-cache"
 	rm -rf pip-cache
-	bzr branch lp:~developer-ubuntu-com-dev/developer-ubuntu-com/dependencies pip-cache
+	bzr branch lp:developer-ubuntu-com/dependencies pip-cache
 	pip install --exists-action=w --download pip-cache/ -r requirements.txt
 	bzr add pip-cache/* 
 	bzr commit pip-cache/ -m 'automatically updated devportal requirements'
-	bzr push --directory pip-cache lp:~developer-ubuntu-com-dev/developer-ubuntu-com/dependencies
+	bzr push --directory pip-cache lp:developer-ubuntu-com/dependencies 
 	bzr revno pip-cache > pip-cache-revno.txt
 	rm -rf pip-cache
 	@echo "** Remember to commit pip-cache-revno.txt"
 
 pip-cache:
 	@echo "Downloading pip-cache"
-	@bzr branch -r `cat pip-cache-revno.txt` lp:~developer-ubuntu-com-dev/developer-ubuntu-com/dependencies pip-cache
+	@bzr branch -r `cat pip-cache-revno.txt` lp:developer-ubuntu-com/dependencies pip-cache
 
 env: pip-cache
 	@echo "Creating virtualenv"
@@ -82,7 +82,7 @@
 
 db.sqlite3: env
 	@echo "Initializing database"
-	@./env/bin/python manage.py syncdb --noinput --migrate
+	@./env/bin/python manage.py migrate --noinput
 	@./env/bin/python manage.py initdb
 	@./env/bin/python manage.py init_apidocs
 

=== modified file 'README.md'
--- README.md	2015-12-08 10:25:29 +0000
+++ README.md	2016-01-19 00:21:38 +0000
@@ -27,7 +27,7 @@
     ./env/bin/python manage.py flush --noinput
     echo "delete from auth_permission;" | ./env/bin/python manage.py dbshell
     ./env/bin/python manage.py loaddata ../dbbackup/dbdump.json
-    ./env/bin/python manage.py syncdb --noinput --all
+    ./env/bin/python manage.py migrate --noinput
     ./env/bin/python manage.py initdb
 
 # Managing translations

=== modified file 'api_docs/migrations/0001_initial.py'
--- api_docs/migrations/0001_initial.py	2015-12-08 10:25:29 +0000
+++ api_docs/migrations/0001_initial.py	2016-01-19 00:21:38 +0000
@@ -1,186 +1,139 @@
 # -*- coding: utf-8 -*-
-from south.utils import datetime_utils as datetime
-from south.db import db
-from south.v2 import SchemaMigration
-from django.db import models
-
-
-class Migration(SchemaMigration):
-
-    def forwards(self, orm):
-        # Adding model 'Topic'
-        db.create_table(u'api_docs_topic', (
-            (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('name', self.gf('django.db.models.fields.CharField')(max_length=64)),
-            ('slug', self.gf('django.db.models.fields.CharField')(max_length=64)),
-        ))
-        db.send_create_signal(u'api_docs', ['Topic'])
-
-        # Adding model 'Language'
-        db.create_table(u'api_docs_language', (
-            (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('topic', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['api_docs.Topic'])),
-            ('name', self.gf('django.db.models.fields.CharField')(max_length=64)),
-            ('slug', self.gf('django.db.models.fields.CharField')(max_length=64)),
-            ('current_version', self.gf('django.db.models.fields.related.ForeignKey')(related_name='current_for_lang', null=True, to=orm['api_docs.Version'])),
-            ('development_version', self.gf('django.db.models.fields.related.ForeignKey')(related_name='development_for_lang', null=True, to=orm['api_docs.Version'])),
-        ))
-        db.send_create_signal(u'api_docs', ['Language'])
-
-        # Adding model 'Version'
-        db.create_table(u'api_docs_version', (
-            (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('language', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['api_docs.Language'], null=True)),
-            ('name', self.gf('django.db.models.fields.CharField')(max_length=64)),
-            ('slug', self.gf('django.db.models.fields.CharField')(max_length=64)),
-        ))
-        db.send_create_signal(u'api_docs', ['Version'])
-
-        # Adding model 'Section'
-        db.create_table(u'api_docs_section', (
-            (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('name', self.gf('django.db.models.fields.CharField')(max_length=64)),
-            ('description', self.gf('django.db.models.fields.TextField')(null=True, blank=True)),
-            ('topic_version', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['api_docs.Version'])),
-        ))
-        db.send_create_signal(u'api_docs', ['Section'])
-
-        # Adding model 'Namespace'
-        db.create_table(u'api_docs_namespace', (
-            (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('platform_section', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['api_docs.Section'])),
-            ('name', self.gf('django.db.models.fields.CharField')(max_length=64)),
-            ('display_name', self.gf('django.db.models.fields.CharField')(default='', max_length=64, blank=True)),
-            ('data', self.gf('django.db.models.fields.TextField')(default='', blank=True)),
-            ('source_file', self.gf('django.db.models.fields.CharField')(max_length=128, null=True, blank=True)),
-            ('source_format', self.gf('django.db.models.fields.CharField')(max_length=32, null=True, blank=True)),
-        ))
-        db.send_create_signal(u'api_docs', ['Namespace'])
-
-        # Adding model 'Element'
-        db.create_table(u'api_docs_element', (
-            (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('name', self.gf('django.db.models.fields.CharField')(max_length=64)),
-            ('description', self.gf('django.db.models.fields.CharField')(default='', max_length=256, blank=True)),
-            ('namespace', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['api_docs.Namespace'], null=True, blank=True)),
-            ('section', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['api_docs.Section'])),
-            ('fullname', self.gf('django.db.models.fields.CharField')(max_length=128)),
-            ('keywords', self.gf('django.db.models.fields.CharField')(default='', max_length=256, blank=True)),
-            ('data', self.gf('django.db.models.fields.TextField')(default='', blank=True)),
-            ('source_file', self.gf('django.db.models.fields.CharField')(max_length=128, null=True, blank=True)),
-            ('source_format', self.gf('django.db.models.fields.CharField')(max_length=32, null=True, blank=True)),
-        ))
-        db.send_create_signal(u'api_docs', ['Element'])
-
-        # Adding model 'Page'
-        db.create_table(u'api_docs_page', (
-            (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('slug', self.gf('django.db.models.fields.CharField')(max_length=64)),
-            ('title', self.gf('django.db.models.fields.CharField')(max_length=64)),
-            ('description', self.gf('django.db.models.fields.CharField')(default='', max_length=256, blank=True)),
-            ('namespace', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['api_docs.Namespace'], null=True, blank=True)),
-            ('section', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['api_docs.Section'])),
-            ('fullname', self.gf('django.db.models.fields.CharField')(max_length=128)),
-            ('keywords', self.gf('django.db.models.fields.CharField')(default='', max_length=256, blank=True)),
-            ('data', self.gf('django.db.models.fields.TextField')(default='', blank=True)),
-            ('source_file', self.gf('django.db.models.fields.CharField')(max_length=128, null=True, blank=True)),
-            ('source_format', self.gf('django.db.models.fields.CharField')(max_length=32, null=True, blank=True)),
-            ('order_index', self.gf('django.db.models.fields.PositiveIntegerField')(default=0, blank=True)),
-        ))
-        db.send_create_signal(u'api_docs', ['Page'])
-
-
-    def backwards(self, orm):
-        # Deleting model 'Topic'
-        db.delete_table(u'api_docs_topic')
-
-        # Deleting model 'Language'
-        db.delete_table(u'api_docs_language')
-
-        # Deleting model 'Version'
-        db.delete_table(u'api_docs_version')
-
-        # Deleting model 'Section'
-        db.delete_table(u'api_docs_section')
-
-        # Deleting model 'Namespace'
-        db.delete_table(u'api_docs_namespace')
-
-        # Deleting model 'Element'
-        db.delete_table(u'api_docs_element')
-
-        # Deleting model 'Page'
-        db.delete_table(u'api_docs_page')
-
-
-    models = {
-        u'api_docs.element': {
-            'Meta': {'ordering': "('name',)", 'object_name': 'Element'},
-            'data': ('django.db.models.fields.TextField', [], {'default': "''", 'blank': 'True'}),
-            'description': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '256', 'blank': 'True'}),
-            'fullname': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'keywords': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '256', 'blank': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '64'}),
-            'namespace': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['api_docs.Namespace']", 'null': 'True', 'blank': 'True'}),
-            'section': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['api_docs.Section']"}),
-            'source_file': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
-            'source_format': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'})
-        },
-        u'api_docs.language': {
-            'Meta': {'object_name': 'Language'},
-            'current_version': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'current_for_lang'", 'null': 'True', 'to': u"orm['api_docs.Version']"}),
-            'development_version': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'development_for_lang'", 'null': 'True', 'to': u"orm['api_docs.Version']"}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '64'}),
-            'slug': ('django.db.models.fields.CharField', [], {'max_length': '64'}),
-            'topic': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['api_docs.Topic']"})
-        },
-        u'api_docs.namespace': {
-            'Meta': {'ordering': "('name',)", 'object_name': 'Namespace'},
-            'data': ('django.db.models.fields.TextField', [], {'default': "''", 'blank': 'True'}),
-            'display_name': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '64', 'blank': 'True'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '64'}),
-            'platform_section': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['api_docs.Section']"}),
-            'source_file': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
-            'source_format': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'})
-        },
-        u'api_docs.page': {
-            'Meta': {'ordering': "('order_index',)", 'object_name': 'Page'},
-            'data': ('django.db.models.fields.TextField', [], {'default': "''", 'blank': 'True'}),
-            'description': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '256', 'blank': 'True'}),
-            'fullname': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'keywords': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '256', 'blank': 'True'}),
-            'namespace': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['api_docs.Namespace']", 'null': 'True', 'blank': 'True'}),
-            'order_index': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0', 'blank': 'True'}),
-            'section': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['api_docs.Section']"}),
-            'slug': ('django.db.models.fields.CharField', [], {'max_length': '64'}),
-            'source_file': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
-            'source_format': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
-            'title': ('django.db.models.fields.CharField', [], {'max_length': '64'})
-        },
-        u'api_docs.section': {
-            'Meta': {'object_name': 'Section'},
-            'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '64'}),
-            'topic_version': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['api_docs.Version']"})
-        },
-        u'api_docs.topic': {
-            'Meta': {'object_name': 'Topic'},
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '64'}),
-            'slug': ('django.db.models.fields.CharField', [], {'max_length': '64'})
-        },
-        u'api_docs.version': {
-            'Meta': {'object_name': 'Version'},
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'language': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['api_docs.Language']", 'null': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '64'}),
-            'slug': ('django.db.models.fields.CharField', [], {'max_length': '64'})
-        }
-    }
-
-    complete_apps = ['api_docs']
\ No newline at end of file
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Element',
+            fields=[
+                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('name', models.CharField(max_length=64)),
+                ('description', models.CharField(default=b'', max_length=256, blank=True)),
+                ('fullname', models.CharField(max_length=128)),
+                ('keywords', models.CharField(default=b'', max_length=256, blank=True)),
+                ('data', models.TextField(default=b'', blank=True)),
+                ('source_file', models.CharField(max_length=128, null=True, blank=True)),
+                ('source_format', models.CharField(max_length=32, null=True, blank=True)),
+            ],
+            options={
+                'ordering': ('name',),
+                'verbose_name': 'Rendered Element',
+                'verbose_name_plural': 'Rendered Elements',
+            },
+        ),
+        migrations.CreateModel(
+            name='Language',
+            fields=[
+                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('name', models.CharField(max_length=64)),
+                ('slug', models.CharField(max_length=64)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='Namespace',
+            fields=[
+                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('name', models.CharField(max_length=64)),
+                ('display_name', models.CharField(default=b'', max_length=64, blank=True)),
+                ('data', models.TextField(default=b'', blank=True)),
+                ('source_file', models.CharField(max_length=128, null=True, blank=True)),
+                ('source_format', models.CharField(max_length=32, null=True, blank=True)),
+            ],
+            options={
+                'ordering': ('name',),
+            },
+        ),
+        migrations.CreateModel(
+            name='Page',
+            fields=[
+                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('slug', models.CharField(max_length=64)),
+                ('title', models.CharField(max_length=64)),
+                ('description', models.CharField(default=b'', max_length=256, blank=True)),
+                ('fullname', models.CharField(max_length=128)),
+                ('keywords', models.CharField(default=b'', max_length=256, blank=True)),
+                ('data', models.TextField(default=b'', blank=True)),
+                ('source_file', models.CharField(max_length=128, null=True, blank=True)),
+                ('source_format', models.CharField(max_length=32, null=True, blank=True)),
+                ('order_index', models.PositiveIntegerField(default=0, blank=True)),
+                ('namespace', models.ForeignKey(blank=True, to='api_docs.Namespace', null=True)),
+            ],
+            options={
+                'ordering': ('order_index',),
+                'verbose_name': 'Rendered Page',
+                'verbose_name_plural': 'Rendered Pages',
+            },
+        ),
+        migrations.CreateModel(
+            name='Section',
+            fields=[
+                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('name', models.CharField(max_length=64)),
+                ('description', models.TextField(null=True, blank=True)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='Topic',
+            fields=[
+                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('name', models.CharField(max_length=64)),
+                ('slug', models.CharField(max_length=64)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='Version',
+            fields=[
+                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('name', models.CharField(max_length=64)),
+                ('slug', models.CharField(max_length=64)),
+                ('language', models.ForeignKey(to='api_docs.Language', null=True)),
+            ],
+        ),
+        migrations.AddField(
+            model_name='section',
+            name='topic_version',
+            field=models.ForeignKey(to='api_docs.Version'),
+        ),
+        migrations.AddField(
+            model_name='page',
+            name='section',
+            field=models.ForeignKey(to='api_docs.Section'),
+        ),
+        migrations.AddField(
+            model_name='namespace',
+            name='platform_section',
+            field=models.ForeignKey(to='api_docs.Section'),
+        ),
+        migrations.AddField(
+            model_name='language',
+            name='current_version',
+            field=models.ForeignKey(related_name='current_for_lang', blank=True, to='api_docs.Version', null=True),
+        ),
+        migrations.AddField(
+            model_name='language',
+            name='development_version',
+            field=models.ForeignKey(related_name='development_for_lang', blank=True, to='api_docs.Version', null=True),
+        ),
+        migrations.AddField(
+            model_name='language',
+            name='topic',
+            field=models.ForeignKey(to='api_docs.Topic'),
+        ),
+        migrations.AddField(
+            model_name='element',
+            name='namespace',
+            field=models.ForeignKey(blank=True, to='api_docs.Namespace', null=True),
+        ),
+        migrations.AddField(
+            model_name='element',
+            name='section',
+            field=models.ForeignKey(to='api_docs.Section'),
+        ),
+    ]

=== modified file 'developer_portal/admin.py'
--- developer_portal/admin.py	2015-12-08 10:25:29 +0000
+++ developer_portal/admin.py	2016-01-19 00:21:38 +0000
@@ -4,20 +4,12 @@
 from reversion.admin import VersionAdmin
 
 from cms.extensions import TitleExtensionAdmin
-from .models import ExternalDocsBranch, SEOExtension
-from django.core.management import call_command
+from .models import SEOExtension
 
 __all__ = (
 )
 
 
-def import_selected_external_docs_branches(modeladmin, request, queryset):
-    for branch in queryset:
-        call_command('import-external-docs-branches', branch.docs_namespace)
-    import_selected_external_docs_branches.short_description = \
-        "Import selected branches"
-
-
 class RevisionAdmin(admin.ModelAdmin):
     list_display = ('date_created', 'user', 'comment')
     list_display_links = ('date_created', )
@@ -35,13 +27,6 @@
 admin.site.register(Version, VersionAdmin)
 
 
-class ExternalDocsBranchAdmin(admin.ModelAdmin):
-    list_display = ('lp_origin', 'docs_namespace')
-    list_filter = ('lp_origin', 'docs_namespace')
-    actions = [import_selected_external_docs_branches]
-
-admin.site.register(ExternalDocsBranch, ExternalDocsBranchAdmin)
-
 class SEOExtensionAdmin(TitleExtensionAdmin):
     pass
 

=== modified file 'developer_portal/blog/views.py'
--- developer_portal/blog/views.py	2015-12-08 10:25:29 +0000
+++ developer_portal/blog/views.py	2016-01-19 00:21:38 +0000
@@ -35,7 +35,9 @@
         return super(MultiLangEntryIndex, self).get(request, *args, **kwargs)
 
     def get_dated_queryset(self, ordering=None, **lookup):
-        return super(MultiLangEntryIndex, self).get_dated_queryset(ordering, **lookup).filter(categories__slug=self.language)
+        if ordering:
+            return super(MultiLangEntryIndex, self).get_dated_queryset(**lookup).filter(categories__slug=self.language).order_by(ordering)
+        return super(MultiLangEntryIndex, self).get_dated_queryset(**lookup).filter(categories__slug=self.language)
 
 class MultiLangEntryYear(MultiLangMixin, EntryYear):
     def get(self, request, *args, **kwargs):
@@ -43,7 +45,9 @@
         return super(MultiLangEntryYear, self).get(request, *args, **kwargs)
 
     def get_dated_queryset(self, ordering=None, **lookup):
-        return super(MultiLangEntryYear, self).get_dated_queryset(ordering, **lookup).filter(categories__slug=self.language)
+        if ordering:
+            return super(MultiLangEntryYear, self).get_dated_queryset(**lookup).filter(categories__slug=self.language).order_by(ordering)
+        return super(MultiLangEntryYear, self).get_dated_queryset(**lookup).filter(categories__slug=self.language)
 
 class MultiLangEntryMonth(MultiLangMixin, EntryMonth):
     def get(self, request, *args, **kwargs):
@@ -51,7 +55,9 @@
         return super(MultiLangEntryMonth, self).get(request, *args, **kwargs)
 
     def get_dated_queryset(self, ordering=None, **lookup):
-        return super(MultiLangEntryMonth, self).get_dated_queryset(ordering, **lookup).filter(categories__slug=self.language)
+        if ordering:
+            return super(MultiLangEntryMonth, self).get_dated_queryset(**lookup).filter(categories__slug=self.language).order_by(ordering)
+        return super(MultiLangEntryMonth, self).get_dated_queryset(**lookup).filter(categories__slug=self.language)
 
 class MultiLangEntryWeek(MultiLangMixin, EntryWeek):
     def get(self, request, *args, **kwargs):
@@ -59,7 +65,9 @@
         return super(MultiLangEntryWeek, self).get(request, *args, **kwargs)
 
     def get_dated_queryset(self, ordering=None, **lookup):
-        return super(MultiLangEntryWeek, self).get_dated_queryset(ordering, **lookup).filter(categories__slug=self.language)
+        if ordering:
+            return super(MultiLangEntryWeek, self).get_dated_queryset(**lookup).filter(categories__slug=self.language).order_by(ordering)
+        return super(MultiLangEntryWeek, self).get_dated_queryset(**lookup).filter(categories__slug=self.language)
 
 class MultiLangEntryDay(MultiLangMixin, EntryDay):
     def get(self, request, *args, **kwargs):
@@ -67,7 +75,9 @@
         return super(MultiLangEntryDay, self).get(request, *args, **kwargs)
 
     def get_dated_queryset(self, ordering=None, **lookup):
-        return super(MultiLangEntryDay, self).get_dated_queryset(ordering, **lookup).filter(categories__slug=self.language)
+        if ordering:
+            return super(MultiLangEntryDay, self).get_dated_queryset(**lookup).filter(categories__slug=self.language).order_by(ordering)
+        return super(MultiLangEntryDay, self).get_dated_queryset(**lookup).filter(categories__slug=self.language)
 
 class MultiLangEntryToday(MultiLangMixin, EntryToday):
     def get(self, request, *args, **kwargs):
@@ -75,4 +85,6 @@
         return super(MultiLangEntryToday, self).get(request, *args, **kwargs)
 
     def get_dated_queryset(self, ordering=None, **lookup):
-        return super(MultiLangEntryToday, self).get_dated_queryset(ordering, **lookup).filter(categories__slug=self.language)
+        if ordering:
+            return super(MultiLangEntryToday, self).get_dated_queryset(**lookup).filter(categories__slug=self.language).order_by(ordering)
+        return super(MultiLangEntryToday, self).get_dated_queryset(**lookup).filter(categories__slug=self.language)

=== modified file 'developer_portal/management/commands/initdb.py'
--- developer_portal/management/commands/initdb.py	2015-12-08 10:25:29 +0000
+++ developer_portal/management/commands/initdb.py	2016-01-19 00:21:38 +0000
@@ -1,17 +1,12 @@
 #!/usr/bin/python
 
 from django.core.management.base import BaseCommand
-from optparse import make_option
-
 from django.conf import settings
 
-import subprocess
-import os
-import sys
-
-from django.contrib.auth.models import User, Group, Permission
-from django.contrib.contenttypes.models import ContentType
+from django.contrib.auth.models import User, Permission
 from cms.models.permissionmodels import PageUserGroup, GlobalPagePermission
+from zinnia.models import Category
+
 
 class Command(BaseCommand):
     help = "Make sure the Developer Portal database is set up properly."
@@ -20,24 +15,25 @@
 
         all_perms = Permission.objects.filter()
 
-        print "Creating admin user."
+        print("Creating admin user.")
         admin, created = User.objects.get_or_create(username='system')
         admin.is_staff = True
         admin.is_superuser = True
         admin.save()
 
         if hasattr(settings, 'ADMIN_GROUP') and settings.ADMIN_GROUP != "":
-            print "Configuring "+settings.ADMIN_GROUP+" group."
-            admins, created = PageUserGroup.objects.get_or_create(name=settings.ADMIN_GROUP, defaults={'created_by': admin})
+            print("Configuring {} group.".format(settings.ADMIN_GROUP))
+            admins, created = PageUserGroup.objects.get_or_create(
+                name=settings.ADMIN_GROUP, defaults={'created_by': admin})
             admins.permissions.add(*list(all_perms))
 
-            print "Configuring global permissions for group."
+            print("Configuring global permissions for group.")
             adminperms, created = GlobalPagePermission.objects.get_or_create(
                 # who:
-                group = admins,
+                group=admins,
 
                 # what:
-                defaults = {
+                defaults={
                     'can_change': True,
                     'can_add': True,
                     'can_delete': True,
@@ -51,18 +47,20 @@
             adminperms.sites.add(settings.SITE_ID)
 
         if hasattr(settings, 'EDITOR_GROUP') and settings.EDITOR_GROUP != "":
-            print "Configuring "+settings.EDITOR_GROUP+" group."
-            editors, created = PageUserGroup.objects.get_or_create(name=settings.EDITOR_GROUP, defaults={'created_by': admin})
-            page_perms = Permission.objects.filter(content_type__app_label='cms', content_type__name='page')
+            print("Configuring {} group.".format(settings.EDITOR_GROUP))
+            editors, created = PageUserGroup.objects.get_or_create(
+                name=settings.EDITOR_GROUP, defaults={'created_by': admin})
+            page_perms = Permission.objects.filter(
+                content_type__app_label='cms', content_type__model='page')
             editors.permissions.add(*list(page_perms))
 
-            print "Configuring global permissions for group."
+            print("Configuring global permissions for group.")
             editorsperms, created = GlobalPagePermission.objects.get_or_create(
                 # who:
-                group = editors,
+                group=editors,
 
                 # what:
-                defaults = {
+                defaults={
                     'can_change': True,
                     'can_add': True,
                     'can_delete': True,
@@ -74,3 +72,11 @@
                 }
             )
             editorsperms.sites.add(settings.SITE_ID)
+
+        print('Adding zinnia categories for the following: {}.'.format(
+            ', '.join([a[0] for a in settings.LANGUAGES])))
+        for lang in settings.LANGUAGES:
+            if lang[1] == 'Simplified Chinese':
+                Category.objects.get_or_create(title='Chinese', slug=lang[0])
+            else:
+                Category.objects.get_or_create(title=lang[1], slug=lang[0])

=== modified file 'developer_portal/management/commands/update-template.py'
--- developer_portal/management/commands/update-template.py	2015-07-09 07:23:54 +0000
+++ developer_portal/management/commands/update-template.py	2016-01-19 00:21:38 +0000
@@ -1,38 +1,35 @@
 #!/usr/bin/python
 
 from django.core.management.base import NoArgsCommand
+from django.core.management import call_command
 
-import subprocess
 import os
-import sys
 
 from django.conf import settings
 
-APP_NAME = "developer_portal"
+APP_NAME = 'developer_portal'
 
-DUMMY_LOCALE = "xx"
+DUMMY_LOCALE = 'xx'
 
 
 def update_template():
-    pwd = os.getcwd()
-    os.chdir(settings.PROJECT_PATH)
-    subprocess.call([sys.executable, "manage.py", "makemessages",
-                     "--keep-pot", "--all", "-i", "env/*", "-i", "urls.py",
-                     "-l", DUMMY_LOCALE])
-    project_locale_path = os.path.join(settings.PROJECT_PATH, "locale")
+    call_command(
+        'makemessages',
+        '--keep-pot', '-i', 'env/*', '-i', 'urls.py',
+        '-l', DUMMY_LOCALE)
+    project_locale_path = os.path.join(settings.PROJECT_PATH, 'locale')
     os.rename(os.path.join(project_locale_path,
-                           "%s/LC_MESSAGES/django.po" % DUMMY_LOCALE),
-              os.path.join(project_locale_path, "%s.pot" % APP_NAME))
+                           '%s/LC_MESSAGES/django.po' % DUMMY_LOCALE),
+              os.path.join(project_locale_path, '%s.pot' % APP_NAME))
     os.removedirs(os.path.join(project_locale_path,
-                               "%s/LC_MESSAGES" % DUMMY_LOCALE))
-    old_pot_fn = os.path.join(project_locale_path, "django.pot")
+                               '%s/LC_MESSAGES' % DUMMY_LOCALE))
+    old_pot_fn = os.path.join(project_locale_path, 'django.pot')
     if os.path.exists(old_pot_fn):
         os.remove(old_pot_fn)
-    os.chdir(pwd)
 
 
 class Command(NoArgsCommand):
-    help = "Update translations template."
+    help = 'Update translations template.'
 
     def handle_noargs(self, **options):
         update_template()

=== added file 'developer_portal/migrations/0001_initial.py'
--- developer_portal/migrations/0001_initial.py	1970-01-01 00:00:00 +0000
+++ developer_portal/migrations/0001_initial.py	2016-01-19 00:21:38 +0000
@@ -0,0 +1,36 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='RawHtml',
+            fields=[
+                ('cmsplugin_ptr', models.OneToOneField(parent_link=True, auto_created=True, primary_key=True, serialize=False, to='cms.CMSPlugin')),
+                ('body', models.TextField(verbose_name='body')),
+            ],
+            options={
+                'abstract': False,
+            },
+            bases=('cms.cmsplugin',),
+        ),
+        migrations.CreateModel(
+            name='SEOExtension',
+            fields=[
+                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('keywords', models.CharField(max_length=256)),
+                ('extended_object', models.OneToOneField(editable=False, to='cms.Title')),
+                ('public_extension', models.OneToOneField(related_name='draft_extension', null=True, editable=False, to='developer_portal.SEOExtension')),
+            ],
+            options={
+                'abstract': False,
+            },
+        ),
+    ]

=== removed file 'developer_portal/migrations/0001_initial.py'
--- developer_portal/migrations/0001_initial.py	2015-12-08 10:25:29 +0000
+++ developer_portal/migrations/0001_initial.py	1970-01-01 00:00:00 +0000
@@ -1,20 +0,0 @@
-# -*- coding: utf-8 -*-
-from south.utils import datetime_utils as datetime
-from south.db import db
-from south.v2 import SchemaMigration
-from django.db import models
-
-
-class Migration(SchemaMigration):
-
-    def forwards(self, orm):
-        pass
-
-    def backwards(self, orm):
-        pass
-
-    models = {
-        
-    }
-
-    complete_apps = ['developer_portal']
\ No newline at end of file

=== removed file 'developer_portal/migrations/0002_add_rawhtml_plugin.py'
--- developer_portal/migrations/0002_add_rawhtml_plugin.py	2015-12-08 10:25:29 +0000
+++ developer_portal/migrations/0002_add_rawhtml_plugin.py	1970-01-01 00:00:00 +0000
@@ -1,53 +0,0 @@
-# -*- coding: utf-8 -*-
-from south.utils import datetime_utils as datetime
-from south.db import db
-from south.v2 import SchemaMigration
-from django.db import models
-
-
-class Migration(SchemaMigration):
-
-    def forwards(self, orm):
-        # Adding model 'RawHtml'
-        db.create_table(u'developer_portal_rawhtml', (
-            (u'cmsplugin_ptr', self.gf('django.db.models.fields.related.OneToOneField')(to=orm['cms.CMSPlugin'], unique=True, primary_key=True)),
-            ('body', self.gf('django.db.models.fields.TextField')()),
-        ))
-        db.send_create_signal(u'developer_portal', ['RawHtml'])
-
-
-    def backwards(self, orm):
-        # Deleting model 'RawHtml'
-        db.delete_table(u'developer_portal_rawhtml')
-
-
-    models = {
-        'cms.cmsplugin': {
-            'Meta': {'object_name': 'CMSPlugin'},
-            'changed_date': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
-            'creation_date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'language': ('django.db.models.fields.CharField', [], {'max_length': '15', 'db_index': 'True'}),
-            'level': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}),
-            'lft': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}),
-            'parent': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['cms.CMSPlugin']", 'null': 'True', 'blank': 'True'}),
-            'placeholder': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['cms.Placeholder']", 'null': 'True'}),
-            'plugin_type': ('django.db.models.fields.CharField', [], {'max_length': '50', 'db_index': 'True'}),
-            'position': ('django.db.models.fields.PositiveSmallIntegerField', [], {'null': 'True', 'blank': 'True'}),
-            'rght': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}),
-            'tree_id': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'})
-        },
-        'cms.placeholder': {
-            'Meta': {'object_name': 'Placeholder'},
-            'default_width': ('django.db.models.fields.PositiveSmallIntegerField', [], {'null': 'True'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'slot': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'})
-        },
-        u'developer_portal.rawhtml': {
-            'Meta': {'object_name': 'RawHtml'},
-            'body': ('django.db.models.fields.TextField', [], {}),
-            u'cmsplugin_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['cms.CMSPlugin']", 'unique': 'True', 'primary_key': 'True'})
-        }
-    }
-
-    complete_apps = ['developer_portal']
\ No newline at end of file

=== removed file 'developer_portal/migrations/0003_add_external_docs_branches.py'
--- developer_portal/migrations/0003_add_external_docs_branches.py	2015-12-08 10:25:29 +0000
+++ developer_portal/migrations/0003_add_external_docs_branches.py	1970-01-01 00:00:00 +0000
@@ -1,62 +0,0 @@
-# -*- coding: utf-8 -*-
-from south.utils import datetime_utils as datetime
-from south.db import db
-from south.v2 import SchemaMigration
-from django.db import models
-
-
-class Migration(SchemaMigration):
-
-    def forwards(self, orm):
-        # Adding model 'ExternalDocsBranch'
-        db.create_table(u'developer_portal_externaldocsbranch', (
-            (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('lp_origin', self.gf('django.db.models.fields.CharField')(max_length=200)),
-            ('docs_namespace', self.gf('django.db.models.fields.CharField')(max_length=120)),
-            ('index_doc', self.gf('django.db.models.fields.CharField')(max_length=120, blank=True)),
-        ))
-        db.send_create_signal(u'developer_portal', ['ExternalDocsBranch'])
-
-
-    def backwards(self, orm):
-        # Deleting model 'ExternalDocsBranch'
-        db.delete_table(u'developer_portal_externaldocsbranch')
-
-
-    models = {
-        'cms.cmsplugin': {
-            'Meta': {'object_name': 'CMSPlugin'},
-            'changed_date': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
-            'creation_date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'language': ('django.db.models.fields.CharField', [], {'max_length': '15', 'db_index': 'True'}),
-            'level': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}),
-            'lft': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}),
-            'parent': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['cms.CMSPlugin']", 'null': 'True', 'blank': 'True'}),
-            'placeholder': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['cms.Placeholder']", 'null': 'True'}),
-            'plugin_type': ('django.db.models.fields.CharField', [], {'max_length': '50', 'db_index': 'True'}),
-            'position': ('django.db.models.fields.PositiveSmallIntegerField', [], {'null': 'True', 'blank': 'True'}),
-            'rght': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}),
-            'tree_id': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'})
-        },
-        'cms.placeholder': {
-            'Meta': {'object_name': 'Placeholder'},
-            'default_width': ('django.db.models.fields.PositiveSmallIntegerField', [], {'null': 'True'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'slot': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'})
-        },
-        u'developer_portal.externaldocsbranch': {
-            'Meta': {'object_name': 'ExternalDocsBranch'},
-            'docs_namespace': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'index_doc': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
-            'lp_origin': ('django.db.models.fields.CharField', [], {'max_length': '200'})
-        },
-        u'developer_portal.rawhtml': {
-            'Meta': {'object_name': 'RawHtml'},
-            'body': ('django.db.models.fields.TextField', [], {}),
-            u'cmsplugin_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['cms.CMSPlugin']", 'unique': 'True', 'primary_key': 'True'})
-        }
-    }
-
-    complete_apps = ['developer_portal']
\ No newline at end of file

=== removed file 'developer_portal/migrations/0004_auto__add_seoextension.py'
--- developer_portal/migrations/0004_auto__add_seoextension.py	2015-12-08 10:25:29 +0000
+++ developer_portal/migrations/0004_auto__add_seoextension.py	1970-01-01 00:00:00 +0000
@@ -1,126 +0,0 @@
-# -*- coding: utf-8 -*-
-from south.utils import datetime_utils as datetime
-from south.db import db
-from south.v2 import SchemaMigration
-from django.db import models
-
-
-class Migration(SchemaMigration):
-
-    def forwards(self, orm):
-        # Adding model 'SEOExtension'
-        db.create_table(u'developer_portal_seoextension', (
-            (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('public_extension', self.gf('django.db.models.fields.related.OneToOneField')(related_name='draft_extension', unique=True, null=True, to=orm['developer_portal.SEOExtension'])),
-            ('extended_object', self.gf('django.db.models.fields.related.OneToOneField')(to=orm['cms.Title'], unique=True)),
-            ('keywords', self.gf('django.db.models.fields.CharField')(max_length=256)),
-        ))
-        db.send_create_signal(u'developer_portal', ['SEOExtension'])
-
-
-    def backwards(self, orm):
-        # Deleting model 'SEOExtension'
-        db.delete_table(u'developer_portal_seoextension')
-
-
-    models = {
-        'cms.cmsplugin': {
-            'Meta': {'object_name': 'CMSPlugin'},
-            'changed_date': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
-            'creation_date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'language': ('django.db.models.fields.CharField', [], {'max_length': '15', 'db_index': 'True'}),
-            'level': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}),
-            'lft': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}),
-            'parent': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['cms.CMSPlugin']", 'null': 'True', 'blank': 'True'}),
-            'placeholder': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['cms.Placeholder']", 'null': 'True'}),
-            'plugin_type': ('django.db.models.fields.CharField', [], {'max_length': '50', 'db_index': 'True'}),
-            'position': ('django.db.models.fields.PositiveSmallIntegerField', [], {'null': 'True', 'blank': 'True'}),
-            'rght': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}),
-            'tree_id': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'})
-        },
-        'cms.page': {
-            'Meta': {'ordering': "('tree_id', 'lft')", 'unique_together': "(('publisher_is_draft', 'application_namespace'), ('reverse_id', 'site', 'publisher_is_draft'))", 'object_name': 'Page'},
-            'application_namespace': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
-            'application_urls': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '200', 'null': 'True', 'blank': 'True'}),
-            'changed_by': ('django.db.models.fields.CharField', [], {'max_length': '70'}),
-            'changed_date': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
-            'created_by': ('django.db.models.fields.CharField', [], {'max_length': '70'}),
-            'creation_date': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'in_navigation': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'db_index': 'True'}),
-            'is_home': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}),
-            'languages': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'level': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}),
-            'lft': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}),
-            'limit_visibility_in_menu': ('django.db.models.fields.SmallIntegerField', [], {'default': 'None', 'null': 'True', 'db_index': 'True', 'blank': 'True'}),
-            'login_required': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'navigation_extenders': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '80', 'null': 'True', 'blank': 'True'}),
-            'parent': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'children'", 'null': 'True', 'to': "orm['cms.Page']"}),
-            'placeholders': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['cms.Placeholder']", 'symmetrical': 'False'}),
-            'publication_date': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}),
-            'publication_end_date': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}),
-            'publisher_is_draft': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'db_index': 'True'}),
-            'publisher_public': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'publisher_draft'", 'unique': 'True', 'null': 'True', 'to': "orm['cms.Page']"}),
-            'reverse_id': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '40', 'null': 'True', 'blank': 'True'}),
-            'revision_id': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
-            'rght': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}),
-            'site': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'djangocms_pages'", 'to': u"orm['sites.Site']"}),
-            'soft_root': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}),
-            'template': ('django.db.models.fields.CharField', [], {'default': "'INHERIT'", 'max_length': '100'}),
-            'tree_id': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}),
-            'xframe_options': ('django.db.models.fields.IntegerField', [], {'default': '0'})
-        },
-        'cms.placeholder': {
-            'Meta': {'object_name': 'Placeholder'},
-            'default_width': ('django.db.models.fields.PositiveSmallIntegerField', [], {'null': 'True'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'slot': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'})
-        },
-        'cms.title': {
-            'Meta': {'unique_together': "(('language', 'page'),)", 'object_name': 'Title'},
-            'creation_date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'has_url_overwrite': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'language': ('django.db.models.fields.CharField', [], {'max_length': '15', 'db_index': 'True'}),
-            'menu_title': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'meta_description': ('django.db.models.fields.TextField', [], {'max_length': '155', 'null': 'True', 'blank': 'True'}),
-            'page': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'title_set'", 'to': "orm['cms.Page']"}),
-            'page_title': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'path': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}),
-            'published': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'publisher_is_draft': ('django.db.models.fields.BooleanField', [], {'default': 'True', 'db_index': 'True'}),
-            'publisher_public': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'publisher_draft'", 'unique': 'True', 'null': 'True', 'to': "orm['cms.Title']"}),
-            'publisher_state': ('django.db.models.fields.SmallIntegerField', [], {'default': '0', 'db_index': 'True'}),
-            'redirect': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}),
-            'slug': ('django.db.models.fields.SlugField', [], {'max_length': '255'}),
-            'title': ('django.db.models.fields.CharField', [], {'max_length': '255'})
-        },
-        u'developer_portal.externaldocsbranch': {
-            'Meta': {'object_name': 'ExternalDocsBranch'},
-            'docs_namespace': ('django.db.models.fields.CharField', [], {'max_length': '120'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'index_doc': ('django.db.models.fields.CharField', [], {'max_length': '120', 'blank': 'True'}),
-            'lp_origin': ('django.db.models.fields.CharField', [], {'max_length': '200'})
-        },
-        u'developer_portal.rawhtml': {
-            'Meta': {'object_name': 'RawHtml'},
-            'body': ('django.db.models.fields.TextField', [], {}),
-            u'cmsplugin_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['cms.CMSPlugin']", 'unique': 'True', 'primary_key': 'True'})
-        },
-        u'developer_portal.seoextension': {
-            'Meta': {'object_name': 'SEOExtension'},
-            'extended_object': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['cms.Title']", 'unique': 'True'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'keywords': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
-            'public_extension': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'draft_extension'", 'unique': 'True', 'null': 'True', 'to': u"orm['developer_portal.SEOExtension']"})
-        },
-        u'sites.site': {
-            'Meta': {'ordering': "(u'domain',)", 'object_name': 'Site', 'db_table': "u'django_site'"},
-            'domain': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
-        }
-    }
-
-    complete_apps = ['developer_portal']
\ No newline at end of file

=== modified file 'developer_portal/models.py'
--- developer_portal/models.py	2015-11-02 16:47:26 +0000
+++ developer_portal/models.py	2016-01-19 00:21:38 +0000
@@ -1,7 +1,5 @@
 from django.db import models
-from django.utils.translation import ugettext_lazy as _
 
-from cms.models import CMSPlugin
 from cms.extensions import TitleExtension
 from cms.extensions.extension_pool import extension_pool
 from djangocms_text_ckeditor.html import extract_images
@@ -20,25 +18,6 @@
         AbstractText.save(self, *args, **kwargs)
 
 
-class ExternalDocsBranch(models.Model):
-    # We originally assumed that branches would also live in LP,
-    # well, we were wrong, but let's keep the name around. It's
-    # no use having a schema/data migration just for this.
-    lp_origin = models.CharField(
-        max_length=200,
-        help_text=_('External branch location, ie: lp:snappy/15.04 or '
-                    'https://github.com/ubuntu-core/snappy.git'))
-    docs_namespace = models.CharField(
-        max_length=120,
-        help_text=_('Path alias we want to use for the docs, '
-                    'ie "snappy/guides/15.04" or '
-                    '"snappy/guides/latest", etc.'))
-    index_doc = models.CharField(
-        max_length=120,
-        help_text=_('File name of doc to be used as index document, '
-                    'ie "intro.md"'),
-        blank=True)
-
 class SEOExtension(TitleExtension):
     keywords = models.CharField(max_length=256)
 

=== modified file 'developer_portal/settings.py'
--- developer_portal/settings.py	2015-12-08 10:25:29 +0000
+++ developer_portal/settings.py	2016-01-19 00:21:38 +0000
@@ -30,8 +30,6 @@
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = True
 
-TEMPLATE_DEBUG = True
-
 ALLOWED_HOSTS = ['127.0.0.1', 'developer.ubuntu.com']
 
 
@@ -49,14 +47,13 @@
     # Allow login from Ubuntu SSO
     'django_openid_auth',
 
-    'mptt', #utilities for implementing a modified pre-order traversal tree
     'menus', #helper for model independent hierarchical website navigation
-    'south', #intelligent schema and data migrations
     'sekizai', #for javascript and css management
     'reversion', #content versioning
     'django_pygments',
     'django_comments',
     'tagging',
+    'template_debug',
 
     'ckeditor',
     'djangocms_text_ckeditor',
@@ -66,6 +63,7 @@
     'djangocms_picture',
     'djangocms_video',
     'djangocms_snippet',
+    'treebeard',
 
     'cmsplugin_zinnia',
     'zinnia',
@@ -78,6 +76,8 @@
     'store_data',
 
     'api_docs',
+
+    'md_importer',
 ]
 
 MIDDLEWARE_CLASSES = (
@@ -107,24 +107,29 @@
 #CACHE_MIDDLEWARE_SECONDS = 3600
 #CACHE_MIDDLEWARE_ANONYMOUS_ONLY = True
 
-TEMPLATE_CONTEXT_PROCESSORS = (
-    'django.contrib.auth.context_processors.auth',
-    'django.core.context_processors.i18n',
-    'django.core.context_processors.request',
-    'django.core.context_processors.media',
-    'django.core.context_processors.static',
-
-    'sekizai.context_processors.sekizai',
-    'cms.context_processors.cms_settings',
-    'django.contrib.messages.context_processors.messages',
-)
-
-TEMPLATE_DIRS = (
-    # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
-    # Always use forward slashes, even on Windows.
-    # Don't forget to use absolute paths, not relative paths.
-    os.path.join(PROJECT_PATH, "templates"),
-)
+TEMPLATES = [
+    {
+        'BACKEND': 'django.template.backends.django.DjangoTemplates',
+        'DIRS': [
+            os.path.join(PROJECT_PATH, "templates"),
+            ],
+        'APP_DIRS': True,
+        'OPTIONS': {
+            'context_processors': [
+                'django.core.context_processors.request',
+                'django.contrib.auth.context_processors.auth',
+                'django.core.context_processors.i18n',
+                'django.core.context_processors.media',
+                'django.core.context_processors.static',
+
+                'sekizai.context_processors.sekizai',
+                'cms.context_processors.cms_settings',
+                'django.contrib.messages.context_processors.messages',
+            ]
+        }
+    }
+]
+
 
 ROOT_URLCONF = 'developer_portal.urls'
 
@@ -318,6 +323,23 @@
     #'PAGINATE_BY': 10,
 }
 
+MIGRATION_MODULES = {
+    'cms': 'cms.migrations',
+    'cmsplugin_zinnia': 'cmsplugin_zinnia.migrations',
+    'djangocms_link': 'djangocms_link.migrations',
+    'djangocms_picture': 'djangocms_picture.migrations',
+    'djangocms_snippet': 'djangocms_snippet.migrations',
+    'djangocms_text_ckeditor': 'djangocms_text_ckeditor.migrations',
+    'djangocms_video': 'djangocms_video.migrations',
+    'django_comments': 'django_comments.migrations',
+    'menus': 'menus.migrations',
+    'rest_framework.authtoken': 'rest_framework.authtoken.migrations',
+    'reversion': 'reversion.migrations',
+    'tagging': 'tagging.migrations',
+    'taggit': 'taggit.migrations',
+    'zinnia': 'zinnia.migrations',
+}
+
 LOGGING = {
     'version': 1,
     'disable_existing_loggers': False,

=== modified file 'developer_portal/urls.py'
--- developer_portal/urls.py	2015-12-08 10:25:29 +0000
+++ developer_portal/urls.py	2016-01-19 00:21:38 +0000
@@ -32,7 +32,7 @@
 
 urlpatterns += i18n_patterns('',
     url(r'^search/', 'developer_portal.views.search', name='search'),
-    url(r'^ckeditor/', include('ckeditor.urls')),
+    url(r'^ckeditor/', include('ckeditor_uploader.urls')),
     url(r'^', include('cms.urls')),
 ) + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
 

=== modified file 'locale/developer_portal.pot'
--- locale/developer_portal.pot	2015-12-14 13:22:16 +0000
+++ locale/developer_portal.pot	2016-01-19 00:21:38 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-14 13:22+0000\n"
+"POT-Creation-Date: 2016-01-19 00:07+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -21,44 +21,28 @@
 msgid "Raw HTML"
 msgstr ""
 
-#: developer_portal/models.py:29
-msgid ""
-"External branch location, ie: lp:snappy/15.04 or https://github.com/ubuntu-"
-"core/snappy.git"
-msgstr ""
-
-#: developer_portal/models.py:33
-msgid ""
-"Path alias we want to use for the docs, ie \"snappy/guides/15.04\" or "
-"\"snappy/guides/latest\", etc."
-msgstr ""
-
-#: developer_portal/models.py:38
-msgid "File name of doc to be used as index document, ie \"intro.md\""
-msgstr ""
-
-#: developer_portal/settings.py:189 developer_portal/settings.py:197
+#: developer_portal/settings.py:194 developer_portal/settings.py:202
 #: templates/translations_dashboard.html:12
 msgid "English"
 msgstr ""
 
-#: developer_portal/settings.py:190 developer_portal/settings.py:204
+#: developer_portal/settings.py:195 developer_portal/settings.py:209
 #: templates/translations_dashboard.html:13
 msgid "Simplified Chinese"
 msgstr ""
 
-#: developer_portal/settings.py:212
+#: developer_portal/settings.py:217
 msgid "Spanish"
 msgstr ""
 
-#: developer_portal/settings.py:252
+#: developer_portal/settings.py:257
 msgid "Page content"
 msgstr ""
 
 #. Translators: this is the default text that will be shown
 #. to editors when editing a page. You can use some HTML,
 #. but don't go wild :)
-#: developer_portal/settings.py:260
+#: developer_portal/settings.py:265
 msgid "<p>Add content here...</p>"
 msgstr ""
 
@@ -68,6 +52,40 @@
 "profile</a> to use the developer site"
 msgstr ""
 
+#: md_importer/models.py:10
+msgid ""
+"External branch location, ie: lp:snappy/15.04 or https://github.com/ubuntu-"
+"core/snappy.git"
+msgstr ""
+
+#: md_importer/models.py:14
+msgid "For use with git branches, ie: \"master\" or \"15.04\" or \"1.x\"."
+msgstr ""
+
+#: md_importer/models.py:19
+msgid "Command to run after checkout of the branch."
+msgstr ""
+
+#: md_importer/models.py:37
+msgid ""
+"File or directory to import from the branch. Ie: \"docs/intro.md\" (file) or "
+"\"docs\" (complete directory), etc."
+msgstr ""
+
+#: md_importer/models.py:43
+msgid ""
+"Article URL (for a specific file) or article namespace for a directory or a "
+"set of files."
+msgstr ""
+
+#: md_importer/models.py:56
+msgid "Datetime"
+msgstr ""
+
+#: md_importer/models.py:56
+msgid "Datetime of last import."
+msgstr ""
+
 #: store_data/cms_plugins.py:11
 msgid "Snap list - Gadget"
 msgstr ""
@@ -101,9 +119,8 @@
 
 #: templates/base.html:34 templates/base.html.py:51
 #: templates/menu/menu_footer_first_level.html:8
-#: templates/menu/menu_header_first_level.html:8
-#: templates/menu/sub_menu.html:8 templates/menu/sub_menu.html.py:22
-#: templates/menu/sub_menu.html:25
+#: templates/menu/menu_header_first_level.html:8 templates/menu/sub_menu.html:8
+#: templates/menu/sub_menu.html.py:22 templates/menu/sub_menu.html:25
 msgid "Overview"
 msgstr ""
 
@@ -175,15 +192,23 @@
 msgid "Go to the top of the page"
 msgstr ""
 
+#: templates/comments/zinnia/entry/form.html:25
+msgid "Comment as"
+msgstr ""
+
+#: templates/comments/zinnia/entry/form.html:25 templates/error_base.html:63
+#: templates/website_base.html:84
+msgid "Log out"
+msgstr ""
+
+#: templates/comments/zinnia/entry/form.html:28
+msgid "Post"
+msgstr ""
+
 #: templates/error_base.html:54 templates/website_base.html:74
 msgid "Jump to content"
 msgstr ""
 
-#: templates/error_base.html:63 templates/website_base.html:84
-#: templates/comments/zinnia/entry/form.html:25
-msgid "Log out"
-msgstr ""
-
 #: templates/error_base.html:69 templates/website_base.html:90
 msgid "Log in"
 msgstr ""
@@ -204,6 +229,14 @@
 "href='https://bugs.launchpad.net/ubuntudeveloperportal'>report it"
 msgstr ""
 
+#: templates/menu/menu_language_chooser.html:6
+msgid "View in:"
+msgstr ""
+
+#: templates/menu/menu_language_chooser.html:10
+msgid "Change to language:"
+msgstr ""
+
 #: templates/search_results.html:4 templates/search_results.html.py:11
 msgid "Search results for:"
 msgstr ""
@@ -224,8 +257,7 @@
 msgid "A simple dashboard to keep track of updates between languages."
 msgstr ""
 
-#: templates/translations_dashboard.html:11
-#: templates/zinnia/entry_list.html:23
+#: templates/translations_dashboard.html:11 templates/zinnia/entry_list.html:23
 msgid "Page"
 msgstr ""
 
@@ -277,22 +309,6 @@
 msgid "Back to top"
 msgstr ""
 
-#: templates/comments/zinnia/entry/form.html:25
-msgid "Comment as"
-msgstr ""
-
-#: templates/comments/zinnia/entry/form.html:28
-msgid "Post"
-msgstr ""
-
-#: templates/menu/menu_language_chooser.html:6
-msgid "View in:"
-msgstr ""
-
-#: templates/menu/menu_language_chooser.html:10
-msgid "Change to language:"
-msgstr ""
-
 #: templates/zinnia/_entry_detail_base.html:33
 #, python-format
 msgid "%(percent)s%% of %(object)s still remains to read."
@@ -334,7 +350,7 @@
 msgid "Authors"
 msgstr ""
 
-#: templates/zinnia/author_list.html:21 templates/zinnia/category_list.html:19
+#: templates/zinnia/author_list.html:21 templates/zinnia/category_list.html:20
 #: templates/zinnia/tag_list.html:20
 #, python-format
 msgid "%(entry_count)s entry"
@@ -354,21 +370,20 @@
 msgid "RSS Feed of latest discussions"
 msgstr ""
 
-#: templates/zinnia/category_list.html:4
-#: templates/zinnia/category_list.html:12
+#: templates/zinnia/category_list.html:5 templates/zinnia/category_list.html:13
 msgid "Category list"
 msgstr ""
 
-#: templates/zinnia/category_list.html:6
+#: templates/zinnia/category_list.html:7
 msgid "Categories"
 msgstr ""
 
-#: templates/zinnia/category_list.html:18
+#: templates/zinnia/category_list.html:19
 #, python-format
 msgid "Show all entries in %(category)s"
 msgstr ""
 
-#: templates/zinnia/category_list.html:24
+#: templates/zinnia/category_list.html:25
 msgid "No categories yet."
 msgstr ""
 

=== added directory 'md_importer'
=== added file 'md_importer/TODO'
--- md_importer/TODO	1970-01-01 00:00:00 +0000
+++ md_importer/TODO	2016-01-19 00:21:38 +0000
@@ -0,0 +1,7 @@
+- fix branch indicator (devel vs. stable, 1.x vs devel, etc.)
+- unpublished docs: some articles show up with a blue circle, so
+  unpublished although they're accessible (not a real issue - content is
+  always updated correctly)
+- add comment at top of RawHTML plugins, so users know not to edit them,
+  currently blocked on LP: #1523925 (RawHTML plugin strips comments)
+- investigate what the api importer does (upload to swift)

=== added file 'md_importer/__init__.py'
=== added file 'md_importer/admin.py'
--- md_importer/admin.py	1970-01-01 00:00:00 +0000
+++ md_importer/admin.py	2016-01-19 00:21:38 +0000
@@ -0,0 +1,36 @@
+from django.contrib import admin
+
+from .models import (
+    ExternalDocsBranch, ExternalDocsBranchImportDirective,
+    ImportedArticle,
+)
+from django.core.management import call_command
+
+__all__ = (
+)
+
+
+def import_selected_external_docs_branches(modeladmin, request, queryset):
+    branches = []
+    for branch in queryset:
+        branches.append(branch.origin)
+    call_command('import_md', *branches)
+    import_selected_external_docs_branches.short_description = \
+        "Import selected branches"
+
+
[e-mail](ExternalDocsBranch)
+class ExternalDocsBranchAdmin(admin.ModelAdmin):
+    list_display = ('origin', 'post_checkout_command', 'branch_name',)
+    list_filter = ('origin', 'post_checkout_command', 'branch_name',)
+    actions = [import_selected_external_docs_branches]
+
+
[e-mail](ExternalDocsBranchImportDirective)
+class ExternalDocsBranchImportDirectiveAdmin(admin.ModelAdmin):
+    pass
+
+
[e-mail](ImportedArticle)
+class ImportedArticleAdmin(admin.ModelAdmin):
+    pass

=== added directory 'md_importer/importer'
=== added file 'md_importer/importer/__init__.py'
--- md_importer/importer/__init__.py	1970-01-01 00:00:00 +0000
+++ md_importer/importer/__init__.py	2016-01-19 00:21:38 +0000
@@ -0,0 +1,5 @@
+from developer_portal.settings import LANGUAGE_CODE
+
+DEFAULT_LANG = LANGUAGE_CODE
+HOME_PAGE_URL = '/{}/'.format(DEFAULT_LANG)
+SUPPORTED_ARTICLE_TYPES = ['.md', '.html']

=== added file 'md_importer/importer/article.py'
--- md_importer/importer/article.py	1970-01-01 00:00:00 +0000
+++ md_importer/importer/article.py	2016-01-19 00:21:38 +0000
@@ -0,0 +1,163 @@
+from bs4 import BeautifulSoup
+import codecs
+import logging
+import markdown
+import os
+import re
+import sys
+
+from . import (
+    DEFAULT_LANG,
+    SUPPORTED_ARTICLE_TYPES,
+)
+from .publish import get_or_create_page, slugify
+
+if sys.version_info.major == 2:
+    from urlparse import urlparse
+else:
+    from urllib.parse import urlparse
+
+
+class Article:
+    def __init__(self, fn, write_to):
+        self.html = None
+        self.page = None
+        self.title = ""
+        self.fn = fn
+        self.write_to = slugify(self.fn)
+        self.full_url = write_to
+        self.slug = os.path.basename(self.full_url)
+
+    def _find_local_images(self):
+        '''Local images are currently not supported.'''
+        soup = BeautifulSoup(self.html, 'html5lib')
+        local_images = []
+        for img in soup.find_all('img'):
+            if img.has_attr('src'):
+                (scheme, netloc, path, params, query, fragment) = \
+                    urlparse(img.attrs['src'])
+                if scheme not in ['http', 'https']:
+                    local_images.extend([img.attrs['src']])
+        return local_images
+
+    def read(self):
+        if os.path.splitext(self.fn)[1] not in SUPPORTED_ARTICLE_TYPES:
+            logging.error("Don't know how to interpret '{}'.".format(
+                self.fn))
+            return False
+        with codecs.open(self.fn, 'r', encoding='utf-8') as f:
+            if self.fn.endswith('.md'):
+                self.html = markdown.markdown(
+                    f.read(),
+                    output_format='html5',
+                    extensions=['pymdownx.github'])
+            elif self.fn.endswith('.html'):
+                self.html = f.read()
+        local_images = self._find_local_images()
+        if local_images:
+            logging.error('Found the following local image(s): {}'.format(
+                ', '.join(local_images)
+            ))
+            return False
+        self.title = self._read_title()
+        self._remove_body_and_html_tags()
+        self._use_developer_site_style()
+        return True
+
+    def _read_title(self):
+        soup = BeautifulSoup(self.html, 'html5lib')
+        if soup.title:
+            return soup.title.text
+        if soup.h1:
+            return soup.h1.text
+        return slugify(self.fn).replace('-', ' ').title()
+
+    def _remove_body_and_html_tags(self):
+        self.html = re.sub(r"<html>\n\s<body>\n", "", self.html,
+                           flags=re.MULTILINE)
+        self.html = re.sub(r"\s<\/body>\n<\/html>", "", self.html,
+                           flags=re.MULTILINE)
+
+    def _use_developer_site_style(self):
+        begin = (u"<div class=\"row no-border\">"
+                 "\n<div class=\"eight-col\">\n")
+        end = u"</div>\n</div>"
+        self.html = begin + self.html + end
+        self.html = self.html.replace(
+            "<pre><code>",
+            "</div><div class=\"twelve-col\"><pre><code>")
+        self.html = self.html.replace(
+            "</code></pre>",
+            "</code></pre></div><div class=\"eight-col\">")
+
+    def replace_links(self, titles, url_map):
+        soup = BeautifulSoup(self.html, 'html5lib')
+        change = False
+        for link in soup.find_all('a'):
+            if not link.has_attr('class') or \
+               'headeranchor-link' not in link.attrs['class']:
+                for title in titles:
+                    if title.endswith(link.attrs['href']) and \
+                       link.attrs['href'] != url_map[title].full_url:
+                        link.attrs['href'] = url_map[title].full_url
+                        change = True
+        if change:
+            self.html = soup.prettify()
+        return change
+
+    def add_to_db(self):
+        '''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)
+        if not self.page:
+            return False
+        self.full_url = self.page.get_absolute_url()
+        return True
+
+    def publish(self):
+        if self.page.is_dirty(DEFAULT_LANG):
+            self.page.publish(DEFAULT_LANG)
+            self.page = self.page.get_public_object()
+        return self.page
+
+
+class SnappyArticle(Article):
+    release_alias = None
+
+    def read(self):
+        if not Article.read(self):
+            return False
+        self.release_alias = re.findall(r'snappy/guides/(\S+?)/\S+?',
+                                        self.full_url)[0]
+        self._make_snappy_mods()
+        return True
+
+    def _make_snappy_mods(self):
+        # Make sure the reader knows which documentation she is browsing
+        if self.release_alias != 'current':
+            before = (u"<div class=\"row no-border\">\n"
+                      "<div class=\"eight-col\">\n")
+            after = (u"<div class=\"row no-border\">\n"
+                     "<div class=\"box pull-three three-col\">"
+                     "<p>You are browsing the Snappy <code>%s</code> "
+                     "documentation.</p>"
+                     "<p><a href=\"/snappy/guides/current/%s\">"
+                     "Back to the latest stable release &rsaquo;"
+                     "</a></p></div>\n"
+                     "<div class=\"eight-col\">\n") % (self.release_alias,
+                                                       self.slug, )
+            self.html = self.html.replace(before, after)
+
+    def add_to_db(self):
+        if self.release_alias == "current":
+            # Add a guides/<page> redirect to guides/current/<page>
+            page = get_or_create_page(
+                title=self.title,
+                full_url=self.full_url.replace('/current', ''),
+                redirect="/snappy/guides/current/{}".format(self.slug))
+            if not page:
+                return False
+        else:
+            self.title += " (%s)" % (self.release_alias,)
+        return Article.add_to_db(self)

=== added file 'md_importer/importer/process.py'
--- md_importer/importer/process.py	1970-01-01 00:00:00 +0000
+++ md_importer/importer/process.py	2016-01-19 00:21:38 +0000
@@ -0,0 +1,60 @@
+from django.core.management import call_command
+
+import datetime
+import pytz
+import shutil
+import tempfile
+
+from md_importer.importer.repo import create_repo
+
+from md_importer.models import (
+    ExternalDocsBranchImportDirective,
+    ImportedArticle,
+)
+
+
+def process_branch(branch):
+    tempdir = tempfile.mkdtemp()
+    repo = create_repo(tempdir, branch.origin, branch.branch_name,
+                       branch.post_checkout_command)
+    if repo.get() != 0:
+        return False
+    for directive in ExternalDocsBranchImportDirective.objects.filter(
+            external_docs_branch=branch):
+        repo.add_directive(directive.import_from,
+                           directive.write_to)
+    if not repo.execute_import_directives():
+        return False
+    if not repo.publish():
+        return False
+    timestamp = datetime.datetime.now(pytz.utc)
+
+    # Update data in ImportedArticle table
+    for page in repo.pages:
+        if ImportedArticle.objects.filter(branch=branch, page=page).count():
+            imported_article = ImportedArticle.objects.filter(
+                branch=branch, page=page)[0]
+            imported_article.last_import = datetime.datetime.now(pytz.utc)
+            imported_article.save()
+        else:
+            ImportedArticle.objects.get_or_create(
+                branch=branch,
+                page=page,
+                last_import=datetime.datetime.now(pytz.utc))
+
+    # Remove old entries
+    for imported_article in ImportedArticle.objects.filter(
+            branch=branch, last_import__lt=timestamp):
+        imported_article.page.delete()
+        imported_article.delete()
+
+    # The import is done, now let's clean up.
+    imported_page_ids = [p.id for p in repo.pages
+                         if p.changed_by in ['python-api', 'script']]
+    ImportedArticle.objects.filter(
+        branch=branch).filter(id__in=imported_page_ids).delete()
+    shutil.rmtree(tempdir)
+
+    # https://stackoverflow.com/questions/33284171/
+    call_command('cms', 'fix-tree')
+    return True

=== added file 'md_importer/importer/publish.py'
--- md_importer/importer/publish.py	1970-01-01 00:00:00 +0000
+++ md_importer/importer/publish.py	2016-01-19 00:21:38 +0000
@@ -0,0 +1,75 @@
+from md_importer.importer import DEFAULT_LANG, HOME_PAGE_URL
+
+from cms.api import create_page, add_plugin
+from cms.models import Title
+from djangocms_text_ckeditor.html import clean_html
+
+import logging
+import re
+import os
+
+
+def slugify(filename):
+    return os.path.basename(filename).replace('.md', '').replace('.html', '')
+
+
+def _find_parent(full_url):
+    if full_url == HOME_PAGE_URL:
+        # If we set up the homepage, we don't need a parent.
+        return None
+    parent_url = re.sub(
+        r'^\/{}\/'.format(DEFAULT_LANG),
+        '',
+        os.path.dirname(full_url))
+
+    parent_pages = Title.objects.select_related('page').filter(
+        path__regex=parent_url, language=DEFAULT_LANG).filter(
+        publisher_is_draft=True)
+    if not parent_pages:
+        logging.error('Parent {} not found.'.format(
+            parent_url))
+        return None
+    return parent_pages[0].page
+
+
+def get_or_create_page(title, full_url, menu_title=None,
+                       in_navigation=True, redirect=None, html=None):
+    # 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
+        if page.get_title() != title:
+            page.title = title
+        if page.get_menu_title() != menu_title:
+            page.menu_title = menu_title
+        if page.in_navigation != in_navigation:
+            page.in_navigation = in_navigation
+        if page.get_redirect() != redirect:
+            page.redirect = redirect
+        if html:
+            # We create the page, so we know there's just one placeholder
+            placeholder = page.placeholders.all()[0]
+            if placeholder.get_plugins():
+                plugin = placeholder.get_plugins()[0].get_plugin_instance()[0]
+                if plugin.body != clean_html(html, full=False):
+                    plugin.body = html
+                    plugin.save()
+            else:
+                add_plugin(
+                    placeholder, 'RawHtmlPlugin',
+                    DEFAULT_LANG, body=html)
+    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,
+            position='last-child', redirect=redirect)
+        placeholder = page.placeholders.get()
+        add_plugin(placeholder, 'RawHtmlPlugin', DEFAULT_LANG, body=html)
+        placeholder = page.placeholders.all()[0]
+        plugin = placeholder.get_plugins()[0].get_plugin_instance()[0]
+    return page

=== added file 'md_importer/importer/repo.py'
--- md_importer/importer/repo.py	1970-01-01 00:00:00 +0000
+++ md_importer/importer/repo.py	2016-01-19 00:21:38 +0000
@@ -0,0 +1,174 @@
+from . import (
+    DEFAULT_LANG,
+    SUPPORTED_ARTICLE_TYPES,
+)
+from .article import Article, SnappyArticle
+from .publish import get_or_create_page, slugify
+from .source import SourceCode
+
+import glob
+import logging
+import os
+
+
+def create_repo(tempdir, origin, branch_name, post_checkout_command):
+    if os.path.exists(origin):
+        if 'snappy' in origin:
+            repo_class = SnappyRepo
+        else:
+            repo_class = Repo
+    else:
+        if origin.startswith('lp:snappy') or \
+           'snappy' in origin.split(':')[1].split('.git')[0].split('/'):
+            repo_class = SnappyRepo
+        else:
+            repo_class = Repo
+    return repo_class(tempdir, origin, branch_name, post_checkout_command)
+
+
+class Repo:
+    def __init__(self, tempdir, origin, branch_name, post_checkout_command):
+        self.directives = []
+        self.imported_articles = []
+        self.url_map = {}
+        self.titles = {}
+        self.index_doc_url = None
+        self.index_page = None
+        self.release_alias = None
+        # On top of the pages in imported_articles this also
+        # includes index_page
+        self.pages = []
+        self.origin = origin
+        self.branch_name = branch_name
+        self.post_checkout_command = post_checkout_command
+        branch_nick = os.path.basename(self.origin.replace('.git', ''))
+        self.checkout_location = os.path.join(
+            tempdir, branch_nick)
+        self.index_doc_title = branch_nick
+        self.article_class = Article
+
+    def get(self):
+        sourcecode = SourceCode(self.origin, self.checkout_location,
+                                self.branch_name, self.post_checkout_command)
+        if sourcecode.get() != 0:
+            logging.error(
+                    'Could not check out branch "{}".'.format(self.origin))
+            return 1
+        return 0
+
+    def add_directive(self, import_from, write_to):
+        self.directives += [
+            {
+                'import_from': os.path.join(self.checkout_location,
+                                            import_from),
+                'write_to': write_to
+            }
+        ]
+
+    def execute_import_directives(self):
+        import_list = []
+        # Import single files first
+        for directive in [d for d in self.directives
+                          if os.path.isfile(d['import_from'])]:
+            import_list += [
+                (directive['import_from'], directive['write_to'])
+            ]
+        # Import directories next
+        for directive in [d for d in self.directives
+                          if os.path.isdir(d['import_from'])]:
+            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)))
+                    ]
+            # If we import into a namespace and don't have an index doc,
+            # we need to write one.
+            if directive['write_to'] not in [x[1] for x in import_list]:
+                self.index_doc_url = directive['write_to']
+        if self.index_doc_url:
+            if not self._create_fake_index_page():
+                logging.error('Importing of {} aborted.'.format(self.origin))
+                return False
+        # The actual import
+        for entry in import_list:
+            article = self._read_article(entry[0], entry[1])
+            if article:
+                self.imported_articles += [article]
+                self.titles[article.fn] = article.title
+                self.url_map[article.fn] = article
+            elif os.path.splitext(entry[0])[1] in SUPPORTED_ARTICLE_TYPES:
+                # In this case the article was supported but still reading
+                # it failed, importing should be stopped here to avoid
+                # problems.
+                logging.error('Importing of {} aborted.'.format(self.origin))
+                return False
+        if self.index_doc_url:
+            self._write_fake_index_doc()
+        return True
+
+    def _read_article(self, fn, write_to):
+        article = self.article_class(fn, write_to)
+        if article.read():
+            return article
+        return None
+
+    def publish(self):
+        for article in self.imported_articles:
+            if not article.add_to_db():
+                logging.error('Publishing of {} aborted.'.format(self.origin))
+                return False
+            article.replace_links(self.titles, self.url_map)
+        self.pages = []
+        for article in self.imported_articles:
+            self.pages.extend([article.publish()])
+        if self.index_page:
+            self.index_page.publish(DEFAULT_LANG)
+            self.pages.extend([self.index_page])
+        return True
+
+    def _create_fake_index_page(self):
+        '''Creates a fake index page at the top of the branches
+           docs namespace.'''
+
+        if self.index_doc_url.endswith('current'):
+            redirect = '/snappy/guides'
+        else:
+            redirect = None
+        self.index_page = get_or_create_page(
+            title=self.index_doc_title, full_url=self.index_doc_url,
+            in_navigation=False, redirect=redirect, html='',
+            menu_title=None)
+        if not self.index_page:
+            return False
+        return True
+
+    def _write_fake_index_doc(self):
+        list_pages = ''
+        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)
+        self.index_page.html = (
+            u'<div class=\"row\"><div class=\"eight-col\">\n'
+            '<p>This section contains documentation for the '
+            '<code>{}</code> Snappy branch.</p>'
+            '<p><ul class=\"list-ubuntu\">{}</ul></p>\n'
+            '<p>Auto-imported from <a '
+            'href=\"{}\">{}</a>.</p>\n'
+            '</div></div>'.format(self.release_alias, list_pages,
+                                  self.origin, self.origin))
+
+
+class SnappyRepo(Repo):
+    def __init__(self, tempdir, origin, branch_name, post_checkout_command):
+        Repo.__init__(self, tempdir, origin, branch_name,
+                      post_checkout_command)
+        self.article_class = SnappyArticle
+        self.index_doc_title = 'Snappy documentation'
+
+    def _create_fake_index_page(self):
+        self.release_alias = os.path.basename(self.index_doc_url)
+        if not self.index_doc_url.endswith('current'):
+            self.index_doc_title += ' ({})'.format(self.release_alias)
+        return Repo._create_fake_index_page(self)

=== added file 'md_importer/importer/source.py'
--- md_importer/importer/source.py	1970-01-01 00:00:00 +0000
+++ md_importer/importer/source.py	2016-01-19 00:21:38 +0000
@@ -0,0 +1,60 @@
+import logging
+import os
+import shutil
+import subprocess
+
+
+class SourceCode():
+    def __init__(self, origin, checkout_location, branch_name,
+                 post_checkout_command):
+        self.origin = origin
+        self.checkout_location = checkout_location
+        self.branch_name = branch_name
+        self.post_checkout_command = post_checkout_command
+
+    def get(self):
+        res = self._get_repo()
+        if res == 0 and self.post_checkout_command:
+            res = self._post_checkout()
+            return res
+        return res
+
+    def _get_repo(self):
+        if os.path.exists(self.origin):
+            shutil.copytree(
+                self.origin,
+                self.checkout_location)
+            return 0
+        if self.origin.startswith('lp:') and \
+           os.path.exists('/usr/bin/bzr'):
+            return subprocess.call([
+                'bzr', 'checkout', '--lightweight', self.origin,
+                self.checkout_location])
+        if self.origin.startswith('https://github.com') and \
+           self.origin.endswith('.git') and \
+           os.path.exists('/usr/bin/git'):
+            retcode = subprocess.call([
+                'git', 'clone', '--quiet', self.origin,
+                self.checkout_location])
+            if retcode == 0 and self.branch_name:
+                pwd = os.getcwd()
+                os.chdir(self.checkout_location)
+                retcode = subprocess.call(['git', 'checkout', '--quiet',
+                                           self.branch_name])
+                os.chdir(pwd)
+            return retcode
+        logging.error(
+            'Repo format "{}" not understood.'.format(self.origin))
+        return 1
+
+    def _post_checkout(self):
+        pwd = os.getcwd()
+        os.chdir(self.checkout_location)
+        process = subprocess.Popen(self.post_checkout_command.split(),
+                                   stdout=subprocess.PIPE)
+        (out, err) = process.communicate()
+        retcode = process.wait()
+        os.chdir(pwd)
+        if retcode != 0:
+            logging.error(out)
+        return retcode

=== added directory 'md_importer/management'
=== added file 'md_importer/management/__init__.py'
=== added directory 'md_importer/management/commands'
=== added file 'md_importer/management/commands/__init__.py'
=== renamed file 'developer_portal/management/commands/import-external-docs-branches.py' => 'md_importer/management/commands/import_md.py'
--- developer_portal/management/commands/import-external-docs-branches.py	2015-12-08 10:25:29 +0000
+++ md_importer/management/commands/import_md.py	2016-01-19 00:21:38 +0000
@@ -1,300 +1,9 @@
+import logging
+
 from django.core.management.base import BaseCommand
-from django.core.management import call_command
-from django.db import transaction
-
-from cms.api import create_page, add_plugin
-from cms.models import Page, Title
-from cms.utils import page_resolver
-
-from bs4 import BeautifulSoup
-import codecs
-import glob
-import logging
-import markdown
-import os
-import re
-import shutil
-import subprocess
-import sys
-import tempfile
-
-from developer_portal.models import ExternalDocsBranch
-
-DOCS_DIRNAME = 'docs'
-
-
-class DBActions:
-    added_pages = []
-    removed_pages = []
-
-    def add_page(self, **kwargs):
-        self.added_pages += [kwargs]
-
-    def remove_page(self, page_id):
-        self.removed_pages += [page_id]
-
-    @transaction.commit_on_success()
-    def run(self):
-        for added_page in self.added_pages:
-            page = get_or_create_page(**added_page)
-            page.publish('en')
-
-        # Only remove pages created by a script!
-        Page.objects.filter(id__in=self.removed_pages,
-                            created_by="script").delete()
-
-        # https://stackoverflow.com/questions/33284171/
-        call_command('cms', 'fix-mptt')
-
-
-class MarkdownFile:
-    html = None
-
-    def __init__(self, fn, docs_namespace, db_actions, slug_override=None):
-        self.fn = fn
-        self.docs_namespace = docs_namespace
-        self.db_actions = db_actions
-        if slug_override:
-            self.slug = slug_override
-        else:
-            self.slug = slugify(self.fn)
-        self.full_url = os.path.join(self.docs_namespace, self.slug)
-        with codecs.open(self.fn, 'r', encoding='utf-8') as f:
-            self.html = markdown.markdown(
-                f.read(),
-                output_format="html5",
-                extensions=['markdown.extensions.tables'])
-        self.release_alias = self._get_release_alias()
-        self.title = self._read_title()
-        self._remove_body_and_html_tags()
-        self._use_developer_site_style()
-
-    def _get_release_alias(self):
-        alias = re.findall(r'/tmp/tmp\S+?/(\S+?)/%s/\S+?' % DOCS_DIRNAME,
-                           self.fn)
-        return alias[0]
-
-    def _read_title(self):
-        soup = BeautifulSoup(self.html, 'html5lib')
-        if soup.title:
-            return soup.title.text
-        if soup.h1:
-            return soup.h1.text
-        return slugify(self.fn).replace('-', ' ').title()
-
-    def _remove_body_and_html_tags(self):
-        self.html = re.sub(r"<html>\n\s<body>\n", "", self.html,
-                           flags=re.MULTILINE)
-        self.html = re.sub(r"\s<\/body>\n<\/html>", "", self.html,
-                           flags=re.MULTILINE)
-
-    def _use_developer_site_style(self):
-        begin = (u"<div class=\"row no-border\">"
-                 "\n<div class=\"eight-col\">\n")
-        end = u"</div>\n</div>"
-        self.html = begin + self.html + end
-        self.html = self.html.replace(
-            "<pre><code>",
-            "</div><div class=\"twelve-col\"><pre><code>")
-        self.html = self.html.replace(
-            "</code></pre>",
-            "</code></pre></div><div class=\"eight-col\">")
-
-    def replace_links(self, titles, url_map):
-        for title in titles:
-            local_md_fn = os.path.basename(title)
-            url = u'/'+url_map[title]
-            # Replace links of the form <a href="/path/somefile.md"> first
-            href = u"<a href=\"{}\">".format(url)
-            md_href = u"<a href=\"{}\">".format(local_md_fn)
-            self.html = self.html.replace(md_href, href)
-
-            # Now we can replace free-standing "somefile.md" references in
-            # the HTML
-            link = href + u"{}</a>".format(titles[title])
-            self.html = self.html.replace(local_md_fn, link)
-
-    def publish(self):
-        '''Publishes pages in their branch alias namespace.'''
-        self.db_actions.add_page(
-            title=self.title, full_url=self.full_url, menu_title=self.title,
-            html=self.html)
-
-
-class SnappyMarkdownFile(MarkdownFile):
-    def __init__(self, fn, docs_namespace, db_actions):
-        MarkdownFile.__init__(self, fn, docs_namespace, db_actions)
-        self._make_snappy_mods()
-
-    def _make_snappy_mods(self):
-        # Make sure the reader knows which documentation she is browsing
-        if self.release_alias != 'current':
-            before = (u"<div class=\"row no-border\">\n"
-                      "<div class=\"eight-col\">\n")
-            after = (u"<div class=\"row no-border\">\n"
-                     "<div class=\"box pull-three three-col\">"
-                     "<p>You are browsing the Snappy <code>%s</code> "
-                     "documentation.</p>"
-                     "<p><a href=\"/snappy/guides/current/%s\">"
-                     "Back to the latest stable release &rsaquo;"
-                     "</a></p></div>\n"
-                     "<div class=\"eight-col\">\n") % (self.release_alias,
-                                                       self.slug, )
-            self.html = self.html.replace(before, after)
-
-    def publish(self):
-        if self.release_alias == "current":
-            # Add a guides/<page> redirect to guides/current/<page>
-            self.db_actions.add_page(
-                title=self.title,
-                full_url=self.full_url.replace('/current', ''),
-                redirect="/snappy/guides/current/%s" % (self.slug))
-        else:
-            self.title += " (%s)" % (self.release_alias,)
-        MarkdownFile.publish(self)
-
-
-def slugify(filename):
-    return os.path.basename(filename).replace('.md', '')
-
-
-class LocalBranch:
-    titles = {}
-    url_map = {}
-
-    def __init__(self, dirname, external_branch, db_actions):
-        self.dirname = dirname
-        self.docs_path = os.path.join(self.dirname, DOCS_DIRNAME)
-        self.doc_fns = glob.glob(self.docs_path+'/*.md')
-        self.md_files = []
-        self.external_branch = external_branch
-        self.docs_namespace = self.external_branch.docs_namespace
-        self.release_alias = os.path.basename(self.docs_namespace)
-        self.index_doc_title = self.release_alias.title()
-        self.index_doc = self.external_branch.index_doc
-        self.db_actions = db_actions
-        self.markdown_class = MarkdownFile
-
-    def import_markdown(self):
-        for doc_fn in self.doc_fns:
-            if self.index_doc and os.path.basename(doc_fn) == self.index_doc:
-                md_file = self.markdown_class(
-                    doc_fn,
-                    os.path.dirname(self.docs_namespace),
-                    self.db_actions,
-                    slug_override=os.path.basename(self.docs_namespace))
-                self.md_files.insert(0, md_file)
-            else:
-                md_file = self.markdown_class(doc_fn, self.docs_namespace,
-                                              self.db_actions)
-                self.md_files += [md_file]
-            self.titles[md_file.fn] = md_file.title
-            self.url_map[md_file.fn] = md_file.full_url
-        if not self.index_doc:
-            self._create_fake_index_doc()
-        for md_file in self.md_files:
-            md_file.replace_links(self.titles, self.url_map)
-
-    def remove_old_pages(self):
-        imported_page_urls = set([md_file.full_url
-                                  for md_file in self.md_files])
-        index_doc = page_resolver.get_page_queryset_from_path(
-            self.docs_namespace)
-        db_pages = []
-        if len(index_doc):
-            # All pages in this namespace currently in the database
-            db_pages = index_doc[0].get_descendants().all()
-        for db_page in db_pages:
-            still_relevant = False
-            for url in imported_page_urls:
-                if url in db_page.get_absolute_url():
-                    still_relevant = True
-                    break
-            # At this point we know that there's no match and the page
-            # can be deleted.
-            if not still_relevant:
-                self.db_actions.remove_page(db_page.id)
-
-    def publish(self):
-        for md_file in self.md_files:
-            md_file.publish()
-
-    def _create_fake_index_doc(self):
-        '''Creates a fake index page at the top of the branches
-           docs namespace.'''
-
-        if self.docs_namespace == "current":
-            redirect = "/snappy/guides"
-        else:
-            redirect = None
-
-        in_navigation = False
-        menu_title = None
-        list_pages = ""
-        for page in self.md_files:
-            list_pages += "<li><a href=\"%s\">%s</a></li>" \
-                % (os.path.basename(page.full_url), page.title)
-        landing = (
-            u"<div class=\"row\"><div class=\"eight-col\">\n"
-            "<p>This section contains documentation for the "
-            "<code>%s</code> Snappy branch.</p>"
-            "<p><ul class=\"list-ubuntu\">%s</ul></p>\n"
-            "<p>Auto-imported from <a "
-            "href=\"https://github.com/ubuntu-core/snappy\">%s</a>.</p>\n"
-            "</div></div>") % (self.release_alias, list_pages,
-                               self.external_branch.lp_origin)
-        self.db_actions.add_page(
-            title=self.index_doc_title, full_url=self.docs_namespace,
-            in_navigation=in_navigation, redirect=redirect, html=landing,
-            menu_title=menu_title)
-
-
-class SnappyLocalBranch(LocalBranch):
-    def __init__(self, dirname, external_branch, db_actions):
-        LocalBranch.__init__(self, dirname, external_branch, db_actions)
-        self.markdown_class = SnappyMarkdownFile
-        self.index_doc_title = 'Snappy documentation'
-        if self.release_alias != 'current':
-            self.index_doc_title += ' (%s)' % self.release_alias
-
-
-def get_or_create_page(title, full_url, menu_title=None,
-                       in_navigation=True, redirect=None, html=None):
-    # First check if pages already exist.
-    pages = Title.objects.select_related('page').filter(path__regex=full_url)
-    if pages:
-        page = pages[0].page
-        page.title = title
-        page.publisher_is_draft = True
-        page.menu_title = menu_title
-        page.in_navigation = in_navigation
-        page.redirect = redirect
-        if html:
-            # We create the page, so we know there's just one placeholder
-            placeholder = page.placeholders.all()[0]
-            if placeholder.get_plugins():
-                plugin = placeholder.get_plugins()[0].get_plugin_instance()[0]
-                plugin.body = html
-                plugin.save()
-            else:
-                add_plugin(placeholder, 'RawHtmlPlugin', 'en', body=html)
-    else:
-        parent_pages = Title.objects.select_related('page').filter(
-            path__regex=os.path.dirname(full_url))
-        if not parent_pages:
-            print('Parent %s not found.' % os.path.dirname(full_url))
-            sys.exit(1)
-        parent = parent_pages[0].page
-
-        slug = os.path.basename(full_url)
-        page = create_page(
-            title, "default.html", "en", slug=slug, parent=parent,
-            menu_title=menu_title, in_navigation=in_navigation,
-            position="last-child", redirect=redirect)
-        if html:
-            placeholder = page.placeholders.get()
-            add_plugin(placeholder, 'RawHtmlPlugin', 'en', body=html)
-    return page
+
+from md_importer.importer.process import process_branch
+from md_importer.models import ExternalDocsBranch
 
 
 def import_branches(selection):
@@ -302,64 +11,26 @@
         logging.error('No branches registered in the '
                       'ExternalDocsBranch table yet.')
         return
-    tempdir = tempfile.mkdtemp()
-    db_actions = DBActions()
     for branch in ExternalDocsBranch.objects.filter(
-            docs_namespace__regex=selection):
-        checkout_location = os.path.join(
-            tempdir, os.path.basename(branch.docs_namespace))
-        sourcecode = SourceCode(branch.lp_origin, checkout_location)
-        if sourcecode.get() != 0:
-            logging.error(
-                'Could not check out branch "%s".' % branch.lp_origin)
-            if os.path.exists(checkout_location):
-                shutil.rmtree(checkout_location)
+            origin__regex=selection, active=True):
+        if not process_branch(branch):
             break
-        if branch.lp_origin.startswith('lp:snappy') or \
-           'snappy' in branch.lp_origin.split(':')[1].split('.git')[0].split('/'):
-            local_branch = SnappyLocalBranch(checkout_location, branch,
-                                             db_actions)
-        else:
-            local_branch = LocalBranch(checkout_location, branch, db_actions)
-        local_branch.import_markdown()
-        local_branch.publish()
-        local_branch.remove_old_pages()
-    shutil.rmtree(tempdir)
-    db_actions.run()
-
-
-class SourceCode():
-    def __init__(self, branch_origin, checkout_location):
-        self.branch_origin = branch_origin
-        self.checkout_location = checkout_location
-
-    def get(self):
-        if self.branch_origin.startswith('lp:') and \
-           os.path.exists('/usr/bin/bzr'):
-            return subprocess.call([
-                'bzr', 'checkout', '--lightweight', self.branch_origin,
-                self.checkout_location])
-        if self.branch_origin.startswith('https://github.com') and \
-           self.branch_origin.endswith('.git') and \
-           os.path.exists('/usr/bin/git'):
-            return subprocess.call([
-                'git', 'clone', '-q', self.branch_origin,
-                self.checkout_location])
-        logging.error(
-            'Branch format "{}" not understood.'.format(self.branch_origin))
-        return 1
 
 
 class Command(BaseCommand):
     help = "Import external branches for documentation."
 
+    def add_arguments(self, parser):
+        parser.add_argument('branches', nargs='*')
+
     def handle(*args, **options):
         logging.basicConfig(
             level=logging.ERROR,
             format='%(asctime)s %(levelname)-8s %(message)s',
             datefmt='%F %T')
-        if len(args) < 2 or args[1] == "all":
-            selection = '.*'
+        branches = options['branches']
+        if not branches:
+            import_branches('.*')
         else:
-            selection = args[1]
-        import_branches(selection)
+            for b in branches:
+                import_branches(b)

=== added directory 'md_importer/migrations'
=== added file 'md_importer/migrations/0001_initial.py'
--- md_importer/migrations/0001_initial.py	1970-01-01 00:00:00 +0000
+++ md_importer/migrations/0001_initial.py	2016-01-19 00:21:38 +0000
@@ -0,0 +1,46 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cms', '0013_urlconfrevision'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='ExternalDocsBranch',
+            fields=[
+                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('origin', models.CharField(help_text='External branch location, ie: lp:snappy/15.04 or https://github.com/ubuntu-core/snappy.git', max_length=200)),
+                ('branch_name', models.CharField(help_text='For use with git branches, ie: "master" or "15.04" or "1.x".', max_length=200, blank=True)),
+                ('post_checkout_command', models.CharField(help_text='Command to run after checkout of the branch.', max_length=100, blank=True)),
+                ('active', models.BooleanField(default=True)),
+            ],
+            options={
+                'verbose_name': 'external docs branch',
+                'verbose_name_plural': 'external docs branches',
+            },
+        ),
+        migrations.CreateModel(
+            name='ExternalDocsBranchImportDirective',
+            fields=[
+                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('import_from', models.CharField(help_text='File or directory to import from the branch. Ie: "docs/intro.md" (file) or "docs" (complete directory), etc.', max_length=150, blank=True)),
+                ('write_to', models.CharField(help_text='Article URL (for a specific file) or article namespace for a directory or a set of files.', max_length=150, blank=True)),
+                ('external_docs_branch', models.ForeignKey(to='md_importer.ExternalDocsBranch')),
+            ],
+        ),
+        migrations.CreateModel(
+            name='ImportedArticle',
+            fields=[
+                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('last_import', models.DateTimeField(help_text='Datetime of last import.', verbose_name='Datetime')),
+                ('branch', models.ForeignKey(to='md_importer.ExternalDocsBranch')),
+                ('page', models.ForeignKey(to='cms.Page')),
+            ],
+        ),
+    ]

=== added file 'md_importer/migrations/__init__.py'
=== added file 'md_importer/models.py'
--- md_importer/models.py	1970-01-01 00:00:00 +0000
+++ md_importer/models.py	2016-01-19 00:21:38 +0000
@@ -0,0 +1,56 @@
+from django.db import models
+from django.utils.translation import ugettext_lazy as _
+
+from cms.models import Page
+
+
+class ExternalDocsBranch(models.Model):
+    origin = models.CharField(
+        max_length=200,
+        help_text=_('External branch location, ie: lp:snappy/15.04 or '
+                    'https://github.com/ubuntu-core/snappy.git'))
+    branch_name = models.CharField(
+        max_length=200,
+        help_text=_('For use with git branches, ie: "master" or "15.04" '
+                    'or "1.x".'),
+        blank=True)
+    post_checkout_command = models.CharField(
+        max_length=100,
+        help_text=_('Command to run after checkout of the branch.'),
+        blank=True)
+    active = models.BooleanField(default=True)
+
+    def __str__(self):
+        if self.branch_name:
+            return "{} - {}".format(self.origin, self.branch_name)
+        return "{}".format(self.origin)
+
+    class Meta:
+        verbose_name = "external docs branch"
+        verbose_name_plural = "external docs branches"
+
+
+class ExternalDocsBranchImportDirective(models.Model):
+    external_docs_branch = models.ForeignKey(ExternalDocsBranch)
+    import_from = models.CharField(
+        max_length=150,
+        help_text=_('File or directory to import from the branch. '
+                    'Ie: "docs/intro.md" (file) or '
+                    '"docs" (complete directory), etc.'),
+        blank=True)
+    write_to = models.CharField(
+        max_length=150,
+        help_text=_('Article URL (for a specific file) or article namespace '
+                    'for a directory or a set of files.'),
+        blank=True)
+
+    def __str__(self):
+        return "{} -- {}".format(self.external_docs_branch,
+                                 self.import_from)
+
+
+class ImportedArticle(models.Model):
+    page = models.ForeignKey(Page)
+    branch = models.ForeignKey(ExternalDocsBranch)
+    last_import = models.DateTimeField(
+        _('Datetime'), help_text=_('Datetime of last import.'))

=== added directory 'md_importer/tests'
=== added file 'md_importer/tests/__init__.py'
=== added directory 'md_importer/tests/data'
=== added directory 'md_importer/tests/data/link-broken-test'
=== added file 'md_importer/tests/data/link-broken-test/file1.md'
--- md_importer/tests/data/link-broken-test/file1.md	1970-01-01 00:00:00 +0000
+++ md_importer/tests/data/link-broken-test/file1.md	2016-01-19 00:21:38 +0000
@@ -0,0 +1,5 @@
+# Test
+
+This is a link to [the file3 file](file3.md).
+
+That's it.

=== added file 'md_importer/tests/data/link-broken-test/file2.md'
--- md_importer/tests/data/link-broken-test/file2.md	1970-01-01 00:00:00 +0000
+++ md_importer/tests/data/link-broken-test/file2.md	2016-01-19 00:21:38 +0000
@@ -0,0 +1,3 @@
+# File 2
+
+Here's just some text.

=== added directory 'md_importer/tests/data/link-test'
=== added file 'md_importer/tests/data/link-test/file1.md'
--- md_importer/tests/data/link-test/file1.md	1970-01-01 00:00:00 +0000
+++ md_importer/tests/data/link-test/file1.md	2016-01-19 00:21:38 +0000
@@ -0,0 +1,5 @@
+# Test
+
+This is a link to [the file2 file](file2.md).
+
+That's it.

=== added file 'md_importer/tests/data/link-test/file2.md'
--- md_importer/tests/data/link-test/file2.md	1970-01-01 00:00:00 +0000
+++ md_importer/tests/data/link-test/file2.md	2016-01-19 00:21:38 +0000
@@ -0,0 +1,3 @@
+# File 2
+
+Here's just some text.

=== added directory 'md_importer/tests/data/link2-test'
=== added file 'md_importer/tests/data/link2-test/file1.md'
--- md_importer/tests/data/link2-test/file1.md	1970-01-01 00:00:00 +0000
+++ md_importer/tests/data/link2-test/file1.md	2016-01-19 00:21:38 +0000
@@ -0,0 +1,5 @@
+# Test
+
+This is a link to [the file3 file](file3.md).
+
+That's it.

=== added file 'md_importer/tests/data/link2-test/file3.md'
--- md_importer/tests/data/link2-test/file3.md	1970-01-01 00:00:00 +0000
+++ md_importer/tests/data/link2-test/file3.md	2016-01-19 00:21:38 +0000
@@ -0,0 +1,3 @@
+# File 3
+
+Here's just some text.

=== added directory 'md_importer/tests/data/local-image-test'
=== added file 'md_importer/tests/data/local-image-test/test1.md'
--- md_importer/tests/data/local-image-test/test1.md	1970-01-01 00:00:00 +0000
+++ md_importer/tests/data/local-image-test/test1.md	2016-01-19 00:21:38 +0000
@@ -0,0 +1,6 @@
+# Local image test
+
+Here is a local image:
+
+![Alt text for a remote image](img.jpg)
+

=== added directory 'md_importer/tests/data/remote-image-test'
=== added file 'md_importer/tests/data/remote-image-test/test1.md'
--- md_importer/tests/data/remote-image-test/test1.md	1970-01-01 00:00:00 +0000
+++ md_importer/tests/data/remote-image-test/test1.md	2016-01-19 00:21:38 +0000
@@ -0,0 +1,6 @@
+# Local image test
+
+Here is a local image:
+
+![Alt text for a remote image](http://design.ubuntu.com/wp-content/uploads/ubuntu-logo112.png)
+

=== added directory 'md_importer/tests/data/snapcraft-test'
=== added file 'md_importer/tests/data/snapcraft-test/CONTRIBUTING.md'
--- md_importer/tests/data/snapcraft-test/CONTRIBUTING.md	1970-01-01 00:00:00 +0000
+++ md_importer/tests/data/snapcraft-test/CONTRIBUTING.md	2016-01-19 00:21:38 +0000
@@ -0,0 +1,32 @@
+# Snapcraft Contribution Guide
+
+Welcome to Snapcraft! We're a pretty friendly community and we're thrilled that
+you want to make Snapcraft even better. However, we do ask that you follow some
+general guidelines while doing so, just so we can keep things organized around
+here.
+
+1. Sign the [contributor license agreement][1].
+
+   This is how you give us permission to use your contributions.
+
+2. We use a forking, feature-based workflow.
+
+   Make a fork of Snapcraft, and create a branch named specifically for the
+   feature on which you'd like to work. Make your changes there, adding new
+   tests as needed, and make sure the existing tests continue to pass when your
+   changes are complete (for information about running the tests, see the
+   [HACKING][2] document).
+
+3. Squash commits into one, well-formatted commit.
+
+   If you really feel like there should be more than one commit in your branch,
+   then you're probably trying to introduce more than one feature and you should
+   make another branch for it.
+
+4. Submit a pull request to get changes from your branch into master.
+
+   If you want to get the change into 1.x as well, make a note of it on the pull
+   request and it can be cherry-picked after the merge.
+
+[1]: http://www.ubuntu.com/legal/contributors/
+[2]: HACKING.md

=== added file 'md_importer/tests/data/snapcraft-test/HACKING.md'
--- md_importer/tests/data/snapcraft-test/HACKING.md	1970-01-01 00:00:00 +0000
+++ md_importer/tests/data/snapcraft-test/HACKING.md	2016-01-19 00:21:38 +0000
@@ -0,0 +1,48 @@
+# Snapcraft
+
+## Running
+
+To see all the commands and options, run `snapcraft --help`.
+
+## Testing
+
+Simply run the top level testing script:
+
+    ./runtests.sh
+
+- If you want to get a test coverage report, install python3-coverage before running the tests:
+
+    sudo apt-get install python3-coverage
+
+
+- If you don't want to run the plainbox integration tests, you can skip them by setting SNAPCRAFT_TESTS_SKIP_PLAINBOX=1 in your environment.
+
+- If you are on 15.04 or earlier, you will need to run:
+
+    sudo add-apt-repository ppa:hardware-certification/public
+
+### PPA
+
+You can install the daily build PPA by running:
+
+    sudo add-apt-repository ppa:snappy-dev/snapcraft-daily
+
+## Hacking
+
+We'd love the help!
+
+- Submit pull requests against [snapcraft](https://github.com/ubuntu-core/snapcraft/pulls)
+- Our mailing list is [e-mail]
+- We can also be found on the #snappy IRC channel on Freenode
+
+### Project Layout
+
+- **bin:** Holds the main snapcraft script. Putting this bin in your PATH or directly running scripts from it will find the rest of the source tree automatically.
+
+- **examples:** Entering the subdirectories and running `../../bin/snapcraft snap` will generally yield interesting results. These examples will give you an idea of what snapcraft can do. These examples are not used during automated testing, they are simply for experimenting.
+
+- **plugins:** Holds yaml metadata for the current snapcraft plugins.
+
+- **tests:** Tests, obviously. `unit` holds Python unit tests and `plainbox` holds plainbox integration tests.
+
+- **snapcraft:** The Python module that houses the core snapcraft logic. The `plugins` subdirectory holds the code for each plugin.

=== added file 'md_importer/tests/data/snapcraft-test/README.md'
--- md_importer/tests/data/snapcraft-test/README.md	1970-01-01 00:00:00 +0000
+++ md_importer/tests/data/snapcraft-test/README.md	2016-01-19 00:21:38 +0000
@@ -0,0 +1,33 @@
+[![Build Status][travis-image]][travis-url] [![Coverage Status][coveralls-image]][coveralls-url]
+
+# Snapcraft
+
+Snapcraft is a delightful packaging tool
+
+Snapcraft helps you assemble a whole project in a single tree out of
+many pieces. It can drive a very wide range of build and packaging systems,
+so that you can simply list all the upstream projects you want and have
+them built and installed together as a single tree.
+
+![Snapcraft Overview][overview-image]
+
+For example, say you want to make a product that includes PyPI packages,
+Node.js packages from NPM, Java, and a bunch of daemons written in C and
+C++ that are built with autotools, snapcraft would make assembling the
+final tree very easy.
+
+Snapcraft allows easy crafting of snap packages for the [snappy Ubuntu Core](http://ubuntu.com/snappy)
+transactional update system.
+
+## More Information
+
+* [Introduction](docs/intro.md) to all the details about the concepts behind snapcraft.
+* [Hacking guide](HACKING.md) to contribute if you're interested in developing Snapcraft.
+
+[travis-image]: https://travis-ci.org/ubuntu-core/snapcraft.svg?branch=master
+[travis-url]: https://travis-ci.org/ubuntu-core/snapcraft
+
+[coveralls-image]: https://coveralls.io/repos/ubuntu-core/snapcraft/badge.svg?branch=master&service=github
+[coveralls-url]: https://coveralls.io/github/ubuntu-core/snapcraft?branch=master
+
+[overview-image]: https://rawgit.com/ted-gould/snapcraft/snapcraft-overview-diagram/docs/snapcraft%20overview.svg

=== added directory 'md_importer/tests/data/snapcraft-test/docs'
=== added file 'md_importer/tests/data/snapcraft-test/docs/get-started.md'
--- md_importer/tests/data/snapcraft-test/docs/get-started.md	1970-01-01 00:00:00 +0000
+++ md_importer/tests/data/snapcraft-test/docs/get-started.md	2016-01-19 00:21:38 +0000
@@ -0,0 +1,47 @@
+# Setting up your Ubuntu development host
+
+Ubuntu is a great and convenient OS for developers. Snappy developer tools are
+readily available to enable app developers familiar with Ubuntu to port and
+write new software for a snappy-based system easily.
+
+For app developers that want the latest stable tools to work on Snappy
+technology, we recommend to use the latest classic Ubuntu Long-Term Support
+(LTS) release as the host. At the time of writing this is Ubuntu 14.04 LTS. For
+those not using an Ubuntu machine (and you should), you can use a VM
+(VirtualBox, VMware, Vagrant) to execute your Ubuntu development host.
+
+This version of snapcraft only works on Ubuntu 16.04 (Xenial Xerus), for
+previous versions of snapcraft, refer to the
+[1.x documentation](https://github.com/ubuntu-core/snapcraft/blob/1.x/docs/get-started.md).
+
+Once your Ubuntu host system is up and running, you can then enable the
+snappy-tools PPA to get the latest tools to develop for Snappy. A PPA is a
+Personal Package Archive that developers can subscribe to install and get
+frequent updates of the software the archive contains. Open up a terminal with
+`Ctrl+Alt+T` and type the following command to add the snappy-tools PPA to
+your system:
+
+	$ sudo apt-add-repository ppa:snappy-dev/tools
+	$ sudo apt update
+
+After that, running the following command will install the `snappy-tools`
+package, which will in turn install the optimal selection of Snappy development
+software to your system.
+
+	$ sudo apt install snappy-tools
+
+The snappy-tools PPA is officially supported by the Snappy Core team for
+Ubuntu LTS releases.  In addition to it, we try to keep snappy-tools also
+conveniently available for the latest Ubuntu stable release as well as the
+current development release for those who prefer those as host. For a
+production environment however, we recommend using an Ubuntu LTS-based host.
+
+This is the most important selection of tools you will get after installation:
+
+	snappy try          - try snaps from a .snap, the [stage] or [snap] dir
+	snappy-remote 	    - run snappy operations on remote snappy target by IP
+	snapcraft           - the snap build tool for all snaps
+
+# Next
+
+How about putting together [your first snap](your-first-snap.md) now?

=== added file 'md_importer/tests/data/snapcraft-test/docs/intro.md'
--- md_importer/tests/data/snapcraft-test/docs/intro.md	1970-01-01 00:00:00 +0000
+++ md_importer/tests/data/snapcraft-test/docs/intro.md	2016-01-19 00:21:38 +0000
@@ -0,0 +1,104 @@
+# Intro
+
+Snapcraft is a build and packaging tool which helps you package your software
+as a snap. It makes it easy to incorporate components from different sources
+and build technologies or solutions.
+
+# Key concepts
+
+A `.snap` package for the Ubuntu Core system contains all its
+dependencies. This has a couple of advantages over traditional `deb` or
+`rpm` based dependency handling, the most important being that a
+developer can always be assured that there are no regressions triggered by
+changes to the system underneath their app.
+
+Snapcraft makes bundling these dependencies easy by allowing you to
+specify them as "parts" in the `snapcraft.yaml` file.
+
+# Snappy
+
+Snappy Ubuntu Core is a new rendition of Ubuntu with transactional updates - a
+minimal server image with the same libraries as today's Ubuntu, but
+applications are provided through a simpler mechanism.
+
+Snappy apps and Ubuntu Core itself can be upgraded atomically and rolled back
+if needed. Apps are also strictly confined and sandboxed to safeguard your
+data and system.
+
+## Parts
+
+A central aspect of a snapcraft recipe is a "part". A part is a piece
+of software or data that the snap package requires to work or to
+build other parts. Each part is managed by a snapcraft plugin and parts
+are usually independent of each other.
+
+## Plugin
+
+Each part has a `plugin` associated to it, this `plugin` provides the mechanism
+to handle it. Parts are driven through plugins, there are a variety of plugins
+already included for python 2 and 3, go, java, and cmake or autotools based
+projects.
+
+## Lifecycle
+
+Each part goes through the following steps:
+
+### Pull
+
+The first is that each part is pulled. This step will download
+content, e.g. checkout a git repository or download a binary component
+like the Java SDK. Snapcraft will create a `parts/` directory with
+sub-directories like `parts/part-name/src` for each part that contains
+the downloaded content.
+
+### Build
+
+The next step is that each part is built in its `parts/part-name/build`
+directory and installs itself into `parts/part-name/install`.
+
+### Stage
+
+After the build of each part the parts are combined into a single
+directory tree that is called the "staging area". It can be found
+under the `./stage` directory.
+
+This `./stage` directory is useful for building outside code that isn't in the
+`snapcraft.yaml` recipe against the snap contents. For example, you might
+build a local project against the libraries in `./stage` by running `snapcraft
+shell make`. Though in general, you are encouraged to add even local
+projects to snapcraft.yaml with a local `source:` path.
+
+For rapid iteration one can run `snappy try` against this directory to have it
+mounted in a `snappy` capable system.
+
+### Strip
+
+The strip step moves the data into a `./snap` directory. It contains only
+the content that will be put into the final snap package, unlike the staging
+area which may include some development files not destined for your package.
+
+The Snappy metadata information about your project will also now be placed in
+`./snap/meta`. Snapcraft takes care of generating all the meta-data Snappy
+expects. For a breakdown of what this is, have a look at our [Snappy developer
+reference](https://developer.ubuntu.com/snappy/guides/packaging-format-apps/).
+
+This `./snap` directory is useful for inspecting what is going into your snap
+and to make any final post-processing on snapcraft's output.
+
+For rapid iteration one can run `snappy try` against this directory to have it
+mounted in a `snappy` capable system.
+
+### Snap
+
+The final step builds a snap package out of the `snap` directory. This `.snap`
+file can be uploaded to the Ubuntu Store and published directly to Snappy
+users.
+
+This command can also be used with a directory argument for projects that
+are not following the snapcraft lifecycle but which follow the internal
+snap format.
+
+# Next
+
+After introducing the key concept of snapcraft it is probably a good
+time [get set up](get-started.md) to create your first snap with snapcraft.

=== added file 'md_importer/tests/data/snapcraft-test/docs/ros-snap.md'
--- md_importer/tests/data/snapcraft-test/docs/ros-snap.md	1970-01-01 00:00:00 +0000
+++ md_importer/tests/data/snapcraft-test/docs/ros-snap.md	2016-01-19 00:21:38 +0000
@@ -0,0 +1,366 @@
+# Using Snappy with ROS
+
+The [Robot Operating System][1] (ROS) is an open-source collection of tools and
+libraries meant to aid in the development of complex robotic systems. ROS is
+excellent at what it does, but there are a few things it doesn't do:
+
+- Security: How does one prevent a rogue application from interfering with one's
+  finely-honed ROS ecosystem? Confinement and access control isn't one of the
+  many problems solved by ROS.
+
+- Deployment: How does one deploy an entire ROS project in one step, without
+  worrying about dependencies?
+
+- Updating: How does one allow end-users to update the entire ROS project in one
+  step, while retaining for the possibility of rolling back the change if
+  the update goes sideways?
+
+These are all problems solved by Snappy; the combination of the two is a perfect
+match for consumer robotic systems.
+
+
+## Package your current ROS project as a .snap
+
+Let's assume you already have a ROS project. It can be as simple or as
+complicated as you like, but for this example, our project will be made up of:
+
+- A ROS package containing a C++ "talker."
+- A ROS package containing a Python "listener," as well as a launch file to
+  bring both the talker and listener up at the same time with roscore.
+
+Our objective will be to create a .snap containing these pieces and their
+dependencies. The easiest way to do that is with Snapcraft, using its Catkin
+plugin. But before we get to that, let's create our project. Prerequisites for
+this walkthrough:
+
+- Installed Snapcraft (see [Getting Started][2]).
+- Installed/configured ROS Indigo (see the [Indigo installation tutorial][3]).
+- An empty ROS workspace (see the Catkin [workspace tutorial][4]).
+- General ROS experience (at least go through the [C++ pub/sub tutorial][5]).
+- General Snapcraft experience (read [Your first snap][6]).
+
+
+### C++ "talker"
+
+First, create the package:
+
+    $ catkin_create_pkg talker roscpp std_msgs
+
+Now make sure the `package.xml` is setup correctly (comments removed for
+brevity):
+
+```xml
+<?xml version="1.0"?>
+<package>
+  <name>talker</name>
+  <version>0.0.0</version>
+  <description>The talker package</description>
+  <maintainer email="[e-mail]">ubuntu</maintainer>
+  <license>TODO</license>
+  <buildtool_depend>catkin</buildtool_depend>
+  <build_depend>roscpp</build_depend>
+  <build_depend>std_msgs</build_depend>
+  <run_depend>roscpp</run_depend>
+  <run_depend>std_msgs</run_depend>
+</package>
+```
+
+Also make sure the `CMakeLists.txt` is setup correctly. Importantly, make sure
+that you've specified install rules, since Snapcraft uses `make install`.
+Anything that doesn't have an install rule won't end up in the final .snap:
+
+```cmake
+cmake_minimum_required(VERSION 2.8.3)
+project(talker)
+
+find_package(catkin REQUIRED COMPONENTS
+  roscpp
+  std_msgs
+)
+
+catkin_package()
+
+include_directories(${catkin_INCLUDE_DIRS})
+
+add_executable(talker_node src/talker_node.cpp)
+
+target_link_libraries(talker_node ${catkin_LIBRARIES})
+
+install(TARGETS talker_node
+  ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
+  LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
+  RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
+)
+```
+
+Finally, for `src/talker_node.cpp`, we have this:
+
+```cpp
+#include <sstream>
+
+#include <ros/ros.h>
+#include <std_msgs/String.h>
+
+int main(int argc, char **argv)
+{
+    ros::init(argc, argv, "talker");
+
+    ros::NodeHandle nodeHandle;
+
+    ros::Publisher publisher = nodeHandle.advertise<std_msgs::String>("chatter", 1);
+
+    ros::Rate loopRate(10);
+
+    int count = 0;
+    while (ros::ok())
+    {
+        std_msgs::String message;
+
+        std::stringstream stream;
+        stream << "Hello world " << count++;
+        message.data = stream.str();
+
+        ROS_INFO("%s", message.data.c_str());
+
+        publisher.publish(message);
+
+        ros::spinOnce();
+
+        loopRate.sleep();
+    }
+
+    return 0;
+}
+```
+
+The "talker" is now complete.
+
+
+### The Python "listener"
+
+First, create the package:
+
+    $ catkin_create_pkg listener rospy std_msgs
+
+Now make sure the `package.xml` is setup correctly (comments removed for
+brevity):
+
+```xml
+<?xml version="1.0"?>
+<package>
+  <name>listener</name>
+  <version>0.0.0</version>
+  <description>The listener package</description>
+  <maintainer email="[e-mail]">ubuntu</maintainer>
+  <license>TODO</license>
+  <buildtool_depend>catkin</buildtool_depend>
+  <build_depend>rospy</build_depend>
+  <build_depend>std_msgs</build_depend>
+  <run_depend>rospy</run_depend>
+  <run_depend>std_msgs</run_depend>
+</package>
+```
+
+Also make sure the `CMakeLists.txt` is setup correctly. Again, it's important to remember the install rules:
+
+```cmake
+cmake_minimum_required(VERSION 2.8.3)
+project(listener)
+
+find_package(catkin REQUIRED COMPONENTS
+  rospy
+  std_msgs
+)
+
+catkin_package()
+
+install(PROGRAMS
+  scripts/listener_node
+  DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
+)
+
+install(FILES
+  talk_and_listen.launch
+  DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
+)
+```
+
+Now for `scripts/listener_node`, we have this:
+
+```python
+#!/usr/bin/env python
+
+import rospy
+from std_msgs.msg import String
+
+def callback(data):
+    rospy.loginfo('I heard %s', data.data)
+
+def listener():
+    rospy.init_node('listener')
+
+    rospy.Subscriber('babble', String, callback)
+
+    rospy.spin()
+
+if __name__ == '__main__':
+    listener()
+```
+
+Make sure this script is executable:
+
+    $ chmod +x scripts/listener_node
+
+Note that the listener subscribes to the `babble` topic, but the talker
+publishes on `chatter`. We need to make sure we account for that in
+`talk_and_listen.launch`:
+
+```xml
+<launch>
+    <node name = "talker" pkg = "talker" type = "talker_node"
+          output = "screen" />
+
+    <node name = "listener" pkg = "listener" type = "listener_node"
+          output = "screen">
+        <remap from = "babble" to = "chatter" />
+    </node>
+</launch>
+```
+
+The "listener" is now complete.
+
+
+### Verify functionality
+
+You can verify that everything works by getting in the workspace root and
+running:
+
+    $ catkin_make
+    $ catkin_make install
+    $ roslaunch listener talk_and_listen.launch
+
+You should see them communicating, looking something like this:
+
+    ...
+    [INFO] [WallTime: 1449512660.316140] I heard Hello world 2
+    [ INFO] [1449512660.415941529]: Hello world 3
+    [INFO] [WallTime: 1449512660.416330] I heard Hello world 3
+    [ INFO] [1449512660.515954882]: Hello world 4
+    [INFO] [WallTime: 1449512660.516307] I heard Hello world 4
+    [ INFO] [1449512660.615954473]: Hello world 5
+    [INFO] [WallTime: 1449512660.616306] I heard Hello world 5
+    ...
+
+### Put it all in a .snap
+
+Let's get back to our stated objective, which was to create a .snap containing
+these pieces and their dependencies. As mentioned, the easiest way to create a
+.snap with complex dependencies is to use Snapcraft. Snapcraft contains a plugin
+especially for Catkin, which makes creating a ROS .snap particularly easy.
+
+We tell Snapcraft how to create the .snap via a file named `snapcraft.yaml`;
+let's create that file in the workspace root, containing the following:
+
+```yaml
+name: ros-talker-and-listener
+version: 1.0
+summary: ROS Example
+description: Contains talker/listener ROS packages and a .launch file.
+
+binaries:
+  launch-project:
+    exec: roslaunch listener talk_and_listen.launch
+
+parts:
+  foo:
+    plugin: catkin
+    source: .
+    catkin-packages:
+      - talker
+      - listener
+    stage-packages:
+      - ros-indigo-ros-core
+```
+
+Most of this file should look familiar to you if you've met the prerequisites,
+but let's focus on a few specific pieces.
+
+```yaml
+# ...
+binaries:
+  launch-project:
+    exec: roslaunch listener talk_and_listen.launch
+# ...
+```
+
+Even though the `talker` and `listener` packages will be installed, they'll be
+within a confined ROS installation, so the user won't be able to simply call
+`rosrun` or `roslaunch`. Instead, you have control over how your .snap is used,
+and here we specify that we only want a single binary, called "launch-project",
+which results in the `roslaunch` call you see. If this seems confusing now, it
+will make more sense when we actually use it.
+
+```yaml
+# ...
+parts:
+  foo:
+    plugin: catkin
+    source: .
+    catkin-packages:
+      - talker
+      - listener
+    stage-packages:
+      - ros-indigo-ros-core
+# ...
+```
+
+This is specifying that the .snap is made up of a single part, called "foo,"
+which utilizes the Catkin plugin. It states that the workspace is in the same
+path as the `snapcraft.yaml`, and it specifies which ROS packages should be
+included in the .snap (`talker` and `listener`). Finally, and this is important,
+it specifies that the Ubuntu package containing `roscore` (ros-indigo-ros-core)
+should be installed into the .snap.
+
+That last point is worth discussing. Currently, since .snaps cannot depend upon
+each other, any .snap that uses roscore must distribute roscore within it. We're
+working on some new features that will enable sharing roscore between snaps, but
+until then there are some limitations to keep in mind:
+
+- `roscore` must be bundled into each .snap that requires it.
+- Snappy's port negotiation feature is still a work-in-progress, which means
+  that only a single .snap that runs `roscore` can be installed at a time or
+  they will fight for the same port.
+
+Now that we understand the `snapcraft.yaml`, let's create the .snap!
+
+    $ snapcraft snap
+
+This will take some time to pull down the dependencies etc., but in the end
+you'll have a .snap.
+
+
+### Take the .snap for a test drive
+
+You can transfer your newly-minted .snap to your Ubuntu Core machine and install
+it at the same time via `snappy-remote`, for example:
+
+    $ snappy-remote --url=ssh://<host>:<port> install \
+      ros-talker-and-listener_1.0_amd64.snap
+
+Now on the Ubuntu Core machine, take a look in `/apps/bin/`, and you'll see the
+binary you requested, called `ros-talker-and-listener.launch-project`. Test it
+out:
+
+    $ ros-talker-and-listener.launch-project
+
+And you should see the talker and listener communicating like before. As usual,
+ctrl+c will stop it. Note also that, since ROS is running in a confined
+environment, its log isn't in `$HOME/.ros` as usual, but in
+`$HOME/apps/ros-talker-and-listener.sideload/1.0/ros`.
+
+[1]: http://www.ros.org/
+[2]: get-started.md
+[3]: http://wiki.ros.org/indigo/Installation/Ubuntu
+[4]: http://wiki.ros.org/catkin/Tutorials/create_a_workspace
+[5]: http://wiki.ros.org/ROS/Tutorials/WritingPublisherSubscriber%28c%2B%2B%29
+[6]: your-first-snap.md

=== added file 'md_importer/tests/data/snapcraft-test/docs/snapcraft overview.svg'
--- md_importer/tests/data/snapcraft-test/docs/snapcraft overview.svg	1970-01-01 00:00:00 +0000
+++ md_importer/tests/data/snapcraft-test/docs/snapcraft overview.svg	2016-01-19 00:21:38 +0000
@@ -0,0 +1,1199 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="629.42749"
+   height="583.61816"
+   viewBox="0 0 629.4275 583.61817"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="snapcraft overview.svg">
+  <defs
+     id="defs4">
+    <marker
+       inkscape:isstock="true"
+       style="overflow:visible"
+       id="marker9243"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:stockid="Arrow2Mend">
+      <path
+         inkscape:connector-curvature="0"
+         transform="scale(-0.6,-0.6)"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         id="path9245" />
+    </marker>
+    <marker
+       inkscape:isstock="true"
+       style="overflow:visible"
+       id="marker9024"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:stockid="Arrow2Mend">
+      <path
+         inkscape:connector-curvature="0"
+         transform="scale(-0.6,-0.6)"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         id="path9026" />
+    </marker>
+    <marker
+       inkscape:isstock="true"
+       style="overflow:visible"
+       id="marker8885"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:stockid="Arrow2Mend">
+      <path
+         inkscape:connector-curvature="0"
+         transform="scale(-0.6,-0.6)"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         style="fill:#ffffff;fill-opacity:0;fill-rule:evenodd;stroke:none;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         id="path8887" />
+    </marker>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient7897">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0"
+         offset="0"
+         id="stop7899" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1"
+         offset="1"
+         id="stop7901" />
+    </linearGradient>
+    <marker
+       inkscape:isstock="true"
+       style="overflow:visible"
+       id="marker7803"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:stockid="Arrow2Mend">
+      <path
+         inkscape:connector-curvature="0"
+         transform="scale(-0.6,-0.6)"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         id="path7805" />
+    </marker>
+    <marker
+       inkscape:isstock="true"
+       style="overflow:visible"
+       id="marker5350"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:stockid="Arrow2Mend">
+      <path
+         transform="scale(-0.6,-0.6)"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         id="path5352"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:isstock="true"
+       style="overflow:visible"
+       id="marker5271"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:stockid="Arrow2Mend">
+      <path
+         transform="scale(-0.6,-0.6)"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         id="path5273"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:isstock="true"
+       style="overflow:visible"
+       id="marker5198"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:stockid="Arrow2Mend">
+      <path
+         transform="scale(-0.6,-0.6)"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         id="path5200"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:isstock="true"
+       style="overflow:visible"
+       id="marker4983"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:stockid="Arrow2Mend">
+      <path
+         transform="scale(-0.6,-0.6)"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         id="path4985"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:isstock="true"
+       style="overflow:visible"
+       id="marker4880"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:stockid="Arrow2Mend">
+      <path
+         transform="scale(-0.6,-0.6)"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         id="path4882"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="marker4828"
+       style="overflow:visible"
+       inkscape:isstock="true"
+       inkscape:collect="always">
+      <path
+         id="path4830"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="scale(-0.6,-0.6)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:isstock="true"
+       style="overflow:visible"
+       id="marker4782"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:stockid="Arrow2Mend"
+       inkscape:collect="always">
+      <path
+         transform="scale(-0.6,-0.6)"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         id="path4784"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Mend"
+       style="overflow:visible"
+       inkscape:isstock="true"
+       inkscape:collect="always">
+      <path
+         id="path4401"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="scale(-0.6,-0.6)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow1Lend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow1Lend"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         id="path4377"
+         d="M 0,0 5,-5 -12.5,0 5,5 0,0 Z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
+         transform="matrix(-0.8,0,0,-0.8,-10,0)"
+         inkscape:connector-curvature="0" />
+    </marker>
+    <marker
+       inkscape:stockid="Arrow2Mend"
+       orient="auto"
+       refY="0"
+       refX="0"
+       id="Arrow2Mend-9"
+       style="overflow:visible"
+       inkscape:isstock="true">
+      <path
+         inkscape:connector-curvature="0"
+         id="path4401-8"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         transform="scale(-0.6,-0.6)" />
+    </marker>
+    <linearGradient
+       id="linearGradient2795">
+      <stop
+         id="stop2797"
+         offset="0"
+         style="stop-color:#b8b8b8;stop-opacity:0.49803922;" />
+      <stop
+         id="stop2799"
+         offset="1"
+         style="stop-color:#7f7f7f;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2787">
+      <stop
+         id="stop2789"
+         offset="0"
+         style="stop-color:#7f7f7f;stop-opacity:0.5;" />
+      <stop
+         id="stop2791"
+         offset="1"
+         style="stop-color:#7f7f7f;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3676">
+      <stop
+         id="stop3678"
+         offset="0"
+         style="stop-color:#b2b2b2;stop-opacity:0.5;" />
+      <stop
+         id="stop3680"
+         offset="1"
+         style="stop-color:#b3b3b3;stop-opacity:0;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3236">
+      <stop
+         id="stop3244"
+         offset="0"
+         style="stop-color:#f4f4f4;stop-opacity:1" />
+      <stop
+         id="stop3240"
+         offset="1"
+         style="stop-color:white;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4671">
+      <stop
+         id="stop4673"
+         offset="0"
+         style="stop-color:#ffd43b;stop-opacity:1;" />
+      <stop
+         id="stop4675"
+         offset="1"
+         style="stop-color:#ffe873;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4689">
+      <stop
+         id="stop4691"
+         offset="0"
+         style="stop-color:#5a9fd4;stop-opacity:1;" />
+      <stop
+         id="stop4693"
+         offset="1"
+         style="stop-color:#306998;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="translate(100.2702,99.61116)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient4671"
+       id="linearGradient2987"
+       y2="144.75717"
+       x2="-65.308502"
+       y1="144.75717"
+       x1="224.23996" />
+    <linearGradient
+       gradientTransform="translate(100.2702,99.61116)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient4689"
+       id="linearGradient2990"
+       y2="76.313133"
+       x2="26.670298"
+       y1="77.475983"
+       x1="172.94208" />
+    <linearGradient
+       y2="144.75717"
+       x2="-65.308502"
+       y1="144.75717"
+       x1="224.23996"
+       gradientTransform="matrix(0.562541,0,0,0.567972,-11.5974,-7.60954)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2255"
+       xlink:href="#linearGradient4671"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="76.313133"
+       x2="26.670298"
+       y1="76.176224"
+       x1="172.94208"
+       gradientTransform="matrix(0.562541,0,0,0.567972,-11.5974,-7.60954)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient2258"
+       xlink:href="#linearGradient4689"
+       inkscape:collect="always" />
+    <radialGradient
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.177966,0,108.7434)"
+       r="29.036913"
+       fy="132.28575"
+       fx="61.518883"
+       cy="132.28575"
+       cx="61.518883"
+       id="radialGradient2801"
+       xlink:href="#linearGradient2795"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="137.27299"
+       x2="112.03144"
+       y1="192.35176"
+       x1="150.96111"
+       gradientTransform="matrix(0.562541,0,0,0.567972,-9.399749,-5.305317)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient1475"
+       xlink:href="#linearGradient4671"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="114.39767"
+       x2="135.66525"
+       y1="20.603781"
+       x1="26.648937"
+       gradientTransform="matrix(0.562541,0,0,0.567972,-9.399749,-5.305317)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient1478"
+       xlink:href="#linearGradient4689"
+       inkscape:collect="always" />
+    <radialGradient
+       r="29.036913"
+       fy="132.28575"
+       fx="61.518883"
+       cy="132.28575"
+       cx="61.518883"
+       gradientTransform="matrix(2.382716e-8,-0.296405,1.43676,4.683673e-7,-128.544,150.5202)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient1480"
+       xlink:href="#linearGradient2795"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7897"
+       id="linearGradient7903"
+       x1="574.78748"
+       y1="518.93152"
+       x2="627.95801"
+       y2="543.29303"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,0.39292731)" />
+    <marker
+       inkscape:isstock="true"
+       style="overflow:visible"
+       id="marker9243-9"
+       refX="0"
+       refY="0"
+       orient="auto"
+       inkscape:stockid="Arrow2Mend">
+      <path
+         inkscape:connector-curvature="0"
+         transform="scale(-0.6,-0.6)"
+         d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+         id="path9245-6" />
+    </marker>
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="1"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.5438176"
+     inkscape:cx="314.71375"
+     inkscape:cy="291.80908"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     units="px"
+     inkscape:showpageshadow="false"
+     showguides="false"
+     inkscape:guide-bbox="true"
+     inkscape:window-width="1486"
+     inkscape:window-height="1036"
+     inkscape:window-x="940"
+     inkscape:window-y="212"
+     inkscape:window-maximized="0"
+     fit-margin-top="20"
+     fit-margin-left="20"
+     fit-margin-right="20"
+     fit-margin-bottom="20"
+     showborder="true">
+    <sodipodi:guide
+       position="470.86538,187.82982"
+       orientation="1,0"
+       id="guide4356" />
+    <sodipodi:guide
+       position="586.76952,189.57274"
+       orientation="0,1"
+       id="guide4358" />
+    <sodipodi:guide
+       position="381.97649,255.80368"
+       orientation="1,0"
+       id="guide4360" />
+    <sodipodi:guide
+       position="548.4253,272.36142"
+       orientation="1,0"
+       id="guide4362" />
+    <sodipodi:guide
+       position="508.33815,349.92133"
+       orientation="0,1"
+       id="guide4364" />
+    <sodipodi:guide
+       position="612.91332,113.75575"
+       orientation="0,1"
+       id="guide4366" />
+    <sodipodi:guide
+       position="548.4253,36.195832"
+       orientation="0,1"
+       id="guide4688" />
+    <sodipodi:guide
+       position="186.76952,113.75575"
+       orientation="1,0"
+       id="guide4690" />
+    <sodipodi:guide
+       position="68.250992,243.60325"
+       orientation="1,0"
+       id="guide4694" />
+    <sodipodi:guide
+       position="420.02074,458.45319"
+       orientation="0,1"
+       id="guide5148" />
+    <sodipodi:guide
+       position="170.49847,514.08991"
+       orientation="1,0"
+       id="guide5150" />
+    <sodipodi:guide
+       position="222.20129,491.61043"
+       orientation="1,0"
+       id="guide5152" />
+    <sodipodi:guide
+       position="160.94469,342.68385"
+       orientation="0,1"
+       id="guide5154" />
+    <sodipodi:guide
+       position="400.91318,430.63483"
+       orientation="0,1"
+       id="guide5156" />
+    <sodipodi:guide
+       position="303.40842,400.56852"
+       orientation="1,0"
+       id="guide5158" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-139.15641,-459.62397)">
+    <g
+       id="g4174"
+       transform="translate(89.103862,103.1549)">
+      <rect
+         y="534.89746"
+         x="70.052551"
+         height="124.65837"
+         width="92.022942"
+         id="rect4136"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:0.13855423;fill-rule:nonzero;stroke:none;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+      <rect
+         y="538.51373"
+         x="73.530533"
+         height="55"
+         width="85"
+         id="rect4138"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.50221306;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+      <text
+         sodipodi:linespacing="125%"
+         id="text4142"
+         y="561.84375"
+         x="116.18498"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15px;line-height:125%;font-family:Ubuntu;-inkscape-font-specification:Ubuntu;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         xml:space="preserve"><tspan
+           y="561.84375"
+           x="116.18498"
+           id="tspan4144"
+           sodipodi:role="line">Source</tspan><tspan
+           id="tspan4146"
+           y="580.59375"
+           x="116.18498"
+           sodipodi:role="line">Code</tspan></text>
+      <rect
+         y="600.51373"
+         x="73.530533"
+         height="55"
+         width="85"
+         id="rect4138-1"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.50221306;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+      <text
+         sodipodi:linespacing="125%"
+         id="text4148"
+         y="623.04871"
+         x="115.86811"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15px;line-height:125%;font-family:Ubuntu;-inkscape-font-specification:Ubuntu;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         xml:space="preserve"><tspan
+           y="623.04871"
+           x="115.86811"
+           id="tspan4150"
+           sodipodi:role="line">snapcraft</tspan><tspan
+           id="tspan4152"
+           y="641.79871"
+           x="115.86811"
+           sodipodi:role="line">yaml</tspan></text>
+    </g>
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#Arrow2Mend)"
+       d="m 521.13289,693.32077 c 126.36166,0 166.44881,84.53159 166.44881,160.34858"
+       id="path4368"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <g
+       id="g4174-4"
+       transform="translate(524.45885,136.18127)">
+      <rect
+         y="534.89746"
+         x="70.052551"
+         height="124.65837"
+         width="92.022942"
+         id="rect4136-5"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:0.13855423;fill-rule:nonzero;stroke:none;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+      <rect
+         y="538.51373"
+         x="73.530533"
+         height="55"
+         width="85"
+         id="rect4138-8"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.50221306;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+      <text
+         sodipodi:linespacing="125%"
+         id="text4142-2"
+         y="571.44373"
+         x="116.18498"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15px;line-height:125%;font-family:Ubuntu;-inkscape-font-specification:Ubuntu;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         xml:space="preserve"><tspan
+           id="tspan4146-4"
+           y="571.44373"
+           x="116.18498"
+           sodipodi:role="line">Binaries</tspan></text>
+      <rect
+         y="600.51373"
+         x="73.530533"
+         height="55"
+         width="85"
+         id="rect4138-1-6"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.50221306;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+      <text
+         sodipodi:linespacing="125%"
+         id="text4148-2"
+         y="623.04871"
+         x="115.86811"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15px;line-height:125%;font-family:Ubuntu;-inkscape-font-specification:Ubuntu;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         xml:space="preserve"><tspan
+           y="623.04871"
+           x="115.86811"
+           id="tspan4150-4"
+           sodipodi:role="line">package</tspan><tspan
+           id="tspan4152-7"
+           y="641.79871"
+           x="115.86811"
+           sodipodi:role="line">metadata</tspan></text>
+    </g>
+    <g
+       id="g4235"
+       transform="translate(287.58171,67.973856)">
+      <rect
+         y="801.38177"
+         x="338.99783"
+         height="122.00436"
+         width="122.00436"
+         id="rect4227"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.50221306;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+      <text
+         sodipodi:linespacing="125%"
+         id="text4229"
+         y="855.71198"
+         x="399.80914"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24px;line-height:125%;font-family:Ubuntu;-inkscape-font-specification:Ubuntu;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         xml:space="preserve"><tspan
+           y="855.71198"
+           x="399.80914"
+           id="tspan4231"
+           sodipodi:role="line">Snappy</tspan><tspan
+           id="tspan4233"
+           y="885.71198"
+           x="399.80914"
+           sodipodi:role="line">Store</tspan></text>
+    </g>
+    <g
+       id="g4235-9"
+       transform="translate(42.701512,-168.19172)">
+      <rect
+         y="801.38177"
+         x="338.99783"
+         height="122.00436"
+         width="122.00436"
+         id="rect4227-0"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.50221306;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+      <text
+         sodipodi:linespacing="125%"
+         id="text4229-8"
+         y="869.47595"
+         x="399.82413"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24px;line-height:125%;font-family:Ubuntu;-inkscape-font-specification:Ubuntu;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         xml:space="preserve"><tspan
+           id="tspan4233-2"
+           y="869.47595"
+           x="399.82413"
+           sodipodi:role="line">Snapcraft</tspan></text>
+    </g>
+    <path
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#marker4782);color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       d="m 610.02178,929.48634 c -284.09585,0 -170.80609,-75.81699 -284.09585,-75.81699"
+       id="path4692"
+       inkscape:connector-curvature="0" />
+    <path
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#marker4828);color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       d="m 610.02178,929.40975 c -284.09585,0 -170.80609,75.81695 -284.09585,75.81695"
+       id="path4692-3"
+       inkscape:connector-curvature="0" />
+    <path
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#marker4880);color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       d="m 610.02178,929.48634 -284.09585,0"
+       id="path4711"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <g
+       id="g4174-4-4"
+       transform="translate(374.16692,301.34465)">
+      <rect
+         y="534.89746"
+         x="70.052551"
+         height="187"
+         width="92.022942"
+         id="rect4136-5-5"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:0.13855423;fill-rule:nonzero;stroke:none;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+      <g
+         id="g4347"
+         transform="translate(0,-2.8292561e-6)">
+        <rect
+           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.50221306;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+           id="rect4138-8-8"
+           width="85"
+           height="55"
+           x="73.530533"
+           y="538.51373" />
+        <text
+           xml:space="preserve"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15px;line-height:125%;font-family:Ubuntu;-inkscape-font-specification:Ubuntu;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           x="116.18498"
+           y="571.44373"
+           id="text4142-2-1"
+           sodipodi:linespacing="125%"><tspan
+             sodipodi:role="line"
+             x="116.18498"
+             y="571.44373"
+             id="tspan4146-4-4">Binaries</tspan></text>
+      </g>
+      <g
+         id="g4341"
+         transform="translate(0,-0.25683877)">
+        <rect
+           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.50221306;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+           id="rect4138-1-6-3"
+           width="85"
+           height="55"
+           x="73.530533"
+           y="600.51373" />
+        <text
+           xml:space="preserve"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15px;line-height:125%;font-family:Ubuntu;-inkscape-font-specification:Ubuntu;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           x="115.86811"
+           y="623.04871"
+           id="text4148-2-9"
+           sodipodi:linespacing="125%"><tspan
+             sodipodi:role="line"
+             id="tspan4150-4-6"
+             x="115.86811"
+             y="623.04871">package</tspan><tspan
+             sodipodi:role="line"
+             x="115.86811"
+             y="641.79871"
+             id="tspan4152-7-0">metadata</tspan></text>
+      </g>
+      <g
+         id="g4335">
+        <rect
+           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.50221306;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+           id="rect4138-1-6-3-3"
+           width="85"
+           height="55"
+           x="74.001198"
+           y="662.00006" />
+        <text
+           xml:space="preserve"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15px;line-height:125%;font-family:Ubuntu;-inkscape-font-specification:Ubuntu;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           x="116.33875"
+           y="684.53503"
+           id="text4148-2-9-4"
+           sodipodi:linespacing="125%"><tspan
+             sodipodi:role="line"
+             x="116.33875"
+             y="684.53503"
+             id="tspan4152-7-0-7">digital</tspan><tspan
+             sodipodi:role="line"
+             x="116.33875"
+             y="703.28503"
+             id="tspan4354">signature</tspan></text>
+      </g>
+    </g>
+    <g
+       id="g5113"
+       transform="translate(-6.743845,-3.9339095)">
+      <rect
+         y="502.17679"
+         x="256.82809"
+         height="69.124413"
+         width="119.70325"
+         id="rect4981"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:none;fill-opacity:0.13855423;fill-rule:nonzero;stroke:#7e7e7e;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:3, 1;stroke-dashoffset:1;stroke-opacity:1;marker:none;marker-end:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+      <text
+         sodipodi:linespacing="125%"
+         id="text5107"
+         y="533.09399"
+         x="316.85104"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15px;line-height:125%;font-family:Ubuntu;-inkscape-font-specification:Ubuntu;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         xml:space="preserve"><tspan
+           y="533.09399"
+           x="316.85104"
+           id="tspan5109"
+           sodipodi:role="line">Snapcraft</tspan><tspan
+           id="tspan5111"
+           y="551.84399"
+           x="316.85104"
+           sodipodi:role="line">Cloud Parts</tspan></text>
+    </g>
+    <g
+       id="g5113-2"
+       transform="translate(146.95962,-3.6528961)">
+      <rect
+         y="502.17679"
+         x="256.82809"
+         height="69.124413"
+         width="250"
+         id="rect4981-9"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:none;fill-opacity:0.13855423;fill-rule:nonzero;stroke:#7e7e7e;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:3, 1;stroke-dashoffset:1;stroke-opacity:1;marker:none;marker-end:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+      <text
+         sodipodi:linespacing="125%"
+         id="text5107-3"
+         y="494.31686"
+         x="383.92838"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:15px;line-height:125%;font-family:Ubuntu;-inkscape-font-specification:Ubuntu;text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         xml:space="preserve"><tspan
+           id="tspan5111-3"
+           y="494.31686"
+           x="383.92838"
+           sodipodi:role="line">Common Repositories</tspan></text>
+    </g>
+    <path
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#marker5350);color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       d="m 442.56482,584.78891 0,27.81836"
+       id="path5160"
+       inkscape:connector-curvature="0" />
+    <path
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#marker5271);color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       d="m 266.10088,700.55825 95.25682,0"
+       id="path5162"
+       inkscape:connector-curvature="0" />
+    <path
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#marker5198);color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       d="m 309.65488,584.78891 c 0,44.67797 6.46286,84.29806 51.70282,84.57906"
+       id="path5164"
+       inkscape:connector-curvature="0" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path5463-4"
+       style="fill:#1b1817;fill-opacity:1;fill-rule:evenodd;stroke:none"
+       d="m 439.90668,510.58478 c -11.2425,0 -20.36,9.11625 -20.36,20.3625 0,8.995 5.83375,16.6275 13.925,19.32125 1.01875,0.18625 1.39,-0.4425 1.39,-0.9825 0,-0.48375 -0.0175,-1.76375 -0.0275,-3.4625 -5.66375,1.23 -6.85875,-2.73 -6.85875,-2.73 -0.92625,-2.3525 -2.26125,-2.97875 -2.26125,-2.97875 -1.84875,-1.2625 0.14,-1.2375 0.14,-1.2375 2.04375,0.14375 3.11875,2.09875 3.11875,2.09875 1.81625,3.11125 4.76625,2.2125 5.92625,1.69125 0.185,-1.315 0.71125,-2.2125 1.2925,-2.72125 -4.52125,-0.515 -9.275,-2.26125 -9.275,-10.06375 0,-2.22375 0.79375,-4.04 2.09625,-5.46375 -0.21,-0.515 -0.90875,-2.585 0.2,-5.38875 0,0 1.70875,-0.5475 5.59875,2.08625 1.62375,-0.45125 3.36625,-0.67625 5.0975,-0.685 1.73,0.009 3.47125,0.23375 5.0975,0.685 3.8875,-2.63375 5.59375,-2.08625 5.59375,-2.08625 1.11125,2.80375 0.4125,4.87375 0.20375,5.38875 1.305,1.42375 2.0925,3.24 2.0925,5.46375 0,7.8225 -4.76125,9.54375 -9.29625,10.0475 0.73,0.62875 1.38125,1.87125 1.38125,3.77125 0,2.72125 -0.025,4.9175 -0.025,5.585 0,0.545 0.3675,1.17875 1.4,0.98 8.085,-2.69875 13.91375,-10.325 13.91375,-19.31875 0,-11.24625 -9.1175,-20.3625 -20.36375,-20.3625" />
+    <g
+       id="g5903"
+       transform="matrix(0.33153681,0,0,0.33153681,478.85446,509.13681)">
+      <path
+         id="path1948"
+         d="m 60.510156,6.3979729 c -4.583653,0.021298 -8.960939,0.4122177 -12.8125,1.09375 C 36.35144,9.4962267 34.291407,13.691825 34.291406,21.429223 l 0,10.21875 26.8125,0 0,3.40625 -26.8125,0 -10.0625,0 c -7.792459,0 -14.6157592,4.683717 -16.7500002,13.59375 -2.46182,10.212966 -2.5710151,16.586023 0,27.25 1.9059283,7.937852 6.4575432,13.593748 14.2500002,13.59375 l 9.21875,0 0,-12.25 c 0,-8.849902 7.657144,-16.656248 16.75,-16.65625 l 26.78125,0 c 7.454951,0 13.406253,-6.138164 13.40625,-13.625 l 0,-25.53125 c 0,-7.266339 -6.12998,-12.7247775 -13.40625,-13.9375001 -4.605987,-0.7667253 -9.385097,-1.1150483 -13.96875,-1.09375 z m -14.5,8.2187501 c 2.769547,0 5.03125,2.298646 5.03125,5.125 -2e-6,2.816336 -2.261703,5.09375 -5.03125,5.09375 -2.779476,-1e-6 -5.03125,-2.277415 -5.03125,-5.09375 -1e-6,-2.826353 2.251774,-5.125 5.03125,-5.125 z"
+         style="fill:url(#linearGradient1478);fill-opacity:1"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path1950"
+         d="m 91.228906,35.054223 0,11.90625 c 0,9.230755 -7.825895,16.999999 -16.75,17 l -26.78125,0 c -7.335833,0 -13.406249,6.278483 -13.40625,13.625 l 0,25.531247 c 0,7.26634 6.318588,11.54032 13.40625,13.625 8.487331,2.49561 16.626237,2.94663 26.78125,0 6.750155,-1.95439 13.406253,-5.88761 13.40625,-13.625 l 0,-10.218747 -26.78125,0 0,-3.40625 26.78125,0 13.406254,0 c 7.79246,0 10.69625,-5.435408 13.40624,-13.59375 2.79933,-8.398886 2.68022,-16.475776 0,-27.25 -1.92578,-7.757441 -5.60387,-13.59375 -13.40624,-13.59375 l -10.062504,0 z m -15.0625,64.65625 c 2.779478,3e-6 5.03125,2.277417 5.03125,5.093747 -2e-6,2.82635 -2.251775,5.125 -5.03125,5.125 -2.76955,0 -5.03125,-2.29865 -5.03125,-5.125 2e-6,-2.81633 2.261697,-5.093747 5.03125,-5.093747 z"
+         style="fill:url(#linearGradient1475);fill-opacity:1"
+         inkscape:connector-curvature="0" />
+      <ellipse
+         transform="matrix(0.73406,0,0,0.809524,16.24958,27.00935)"
+         id="path1894"
+         style="opacity:0.44382025;fill:url(#radialGradient1480);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:20;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         cx="61.518883"
+         cy="132.28575"
+         rx="48.948284"
+         ry="8.6066771" />
+    </g>
+    <image
+       y="510.65253"
+       x="539.22363"
+       id="image7798"
+       xlink:href="data:image/png;base64,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
+Gt0EzcEAAAAASUVORK5CYII=
+"
+       preserveAspectRatio="none"
+       height="38.276688"
+       width="38.276688" />
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24px;line-height:125%;font-family:Ubuntu;-inkscape-font-specification:Ubuntu;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       x="591.80872"
+       y="531.6861"
+       id="text8871"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan8873"
+         x="591.80872"
+         y="531.6861">……</tspan></text>
+    <rect
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:url(#linearGradient7903);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-end:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       id="rect7801"
+       width="97.053047"
+       height="81.728882"
+       x="574.12695"
+       y="494.32266" />
+    <g
+       id="g8879"
+       transform="translate(-0.27784156,15.003444)">
+      <path
+         sodipodi:nodetypes="czsssc"
+         inkscape:connector-curvature="0"
+         id="path8875"
+         d="m 249.76963,912.25001 c -9.61837,-7.34936 -19.09612,0.32907 -18.33733,7.25045 0.75879,6.92138 6.8411,11.37657 13.72067,11.42422 l 50.15039,0.3473 c 4.03101,0.0279 12.08612,-8.47417 10.0023,-16.84414 -2.08381,-8.36998 -14.30884,-16.77469 -26.39494,-5.93887"
+         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cc"
+         inkscape:connector-curvature="0"
+         id="path8877"
+         d="m 243.62484,909.3225 c 0.55568,-15.55913 26.95063,-23.61653 39.4535,-3.3341"
+         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    </g>
+    <g
+       id="g4347-5"
+       transform="translate(143.43127,303.02174)">
+      <g
+         id="g9018"
+         transform="translate(51.678531,-9.1687717)">
+        <rect
+           ry="5"
+           rx="5"
+           y="533.23474"
+           x="70.613205"
+           height="54.72216"
+           width="28.32032"
+           id="rect4138-8-8-9-9"
+           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.50221306;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+        <rect
+           y="538.65265"
+           x="73.53054"
+           height="43.886337"
+           width="22.485647"
+           id="rect4138-8-8-9"
+           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.50221306;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+      </g>
+    </g>
+    <g
+       id="g9789"
+       transform="translate(7.125194,1.2954898)">
+      <rect
+         y="1003.0229"
+         x="253.4267"
+         height="7.7959223"
+         width="18.228931"
+         id="rect9022"
+         style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-end:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+      <g
+         id="g9756">
+        <rect
+           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-end:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+           id="rect9022-7"
+           width="5.1752357"
+           height="5.5057745"
+           x="284.96884"
+           y="1004.7013" />
+        <path
+           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 263.23546,1007.3397 23.17593,0.229"
+           id="path9237"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cc" />
+        <path
+           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 287.55645,1005.5162 0,-7.78642"
+           id="path9239"
+           inkscape:connector-curvature="0" />
+        <circle
+           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-end:url(#marker9243);color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+           id="path9241"
+           cx="287.55646"
+           cy="996.92834"
+           r="1.2954898" />
+        <path
+           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="m 288.13774,996.68547 c 0,0 14.33135,-5.91067 14.41232,-0.72871 0.081,5.18194 -14.41232,0.72871 -14.41232,0.72871 z"
+           id="path9595"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="czc" />
+        <path
+           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="m 286.87091,996.68547 c 0,0 -14.33134,-5.91067 -14.41231,-0.72871 -0.081,5.18194 14.41231,0.72871 14.41231,0.72871 z"
+           id="path9595-5"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="czc" />
+      </g>
+      <g
+         transform="translate(0,0.51071554)"
+         id="g9764">
+        <rect
+           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-end:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+           id="rect9022-7-5"
+           width="5.1752357"
+           height="5.5057745"
+           x="-240.11348"
+           y="1004.1906"
+           transform="scale(-1,1)" />
+        <path
+           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 261.84687,1006.8289 -23.17593,0.229"
+           id="path9237-4"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="cc" />
+        <path
+           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+           d="m 237.52588,1005.0054 0,-7.78637"
+           id="path9239-4"
+           inkscape:connector-curvature="0" />
+        <circle
+           style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-end:url(#marker9243-9);color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+           id="path9241-9"
+           cx="-237.52586"
+           cy="996.41754"
+           r="1.2954898"
+           transform="scale(-1,1)" />
+        <path
+           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="m 236.94459,996.17473 c 0,0 -14.33135,-5.9107 -14.41232,-0.7287 -0.081,5.18187 14.41232,0.7287 14.41232,0.7287 z"
+           id="path9595-59"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="czc" />
+        <path
+           style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="m 238.21142,996.17473 c 0,0 14.33134,-5.9107 14.41231,-0.7287 0.081,5.18187 -14.41231,0.7287 -14.41231,0.7287 z"
+           id="path9595-5-0"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="czc" />
+      </g>
+      <path
+         inkscape:connector-curvature="0"
+         id="path9772"
+         d="m 257.53179,1008.2639 -3.72453,8.5826"
+         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path9772-8"
+         d="m 267.80726,1008.2639 3.72453,8.5826"
+         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    </g>
+  </g>
+</svg>

=== added file 'md_importer/tests/data/snapcraft-test/docs/snapcraft-advanced-features.md'
--- md_importer/tests/data/snapcraft-test/docs/snapcraft-advanced-features.md	1970-01-01 00:00:00 +0000
+++ md_importer/tests/data/snapcraft-test/docs/snapcraft-advanced-features.md	2016-01-19 00:21:38 +0000
@@ -0,0 +1,233 @@
+# Snapcraft: Advanced features
+
+Once you have built [your first snap](your-first-snap.md), you will probably
+want to learn more about snapcraft's more advanced features. Having a look at
+our selection of examples is a good idea, as we want it to be a good showcase
+of what is possible and generally relevant.
+
+## Examples
+
+Our showcase can be found in the actual source of `snapcraft` itself. Check
+it out by simply running:
+
+	git clone https://github.com/ubuntu-core/snapcraft
+	cd snapcraft/examples
+
+Inspecting the source locally will make easier to build the examples and
+play around with them. (You can
+[view them online](https://github.com/ubuntu-core/snapcraft/tree/master/examples)
+as well.)
+
+### Playing around with the examples
+
+If you just cloned the `snapcraft` source and inspect the examples, you
+can start off your explorations by reading the accompanying `snapcraft.yaml`
+file and running:
+
+	../../bin/snapcraft snap
+
+This will inform you of all the steps taken during the creation of the snap.
+
+## Defining your parts
+
+Once you have noted down all the general information about your snap
+(like description, summary information and everything else), naming
+the individual parts will define the stucture of your `snapcraft.yaml` file.
+Think of parts as individual components of your snap: Where do you pull them
+from? How are they built?
+
+### Prerequisites during the build
+
+The example named `downloader-with-wiki-parts` shows how very easy you can
+make sure that the relevant build dependencies are installed:
+
+	build-packages: [libssl-dev]
+
+The above will install the `libssl-dev` package from the Ubuntu archive before
+an attempted build. If you need a specific version of libssl-dev or a custom
+build, you will need to specify a separate part.
+
+Also note that the above will not define which libraries are shipped with the
+app. It merely makes sure you have all the relevant build tools installed.
+
+
+### Pulling and building
+
+If you just intend to pull and build the source, take a look at the `gopaste`
+example. In its `snapcraft.yaml` file you can find just this one `parts`
+paragraph:
+
+	parts:
+ 	  gopaste:
+    	    plugin: go
+            source: git://github.com/wisnij/gopaste/gopasted
+
+It starts off with the name of the specific part (`gopaste` here), the origin
+of the part (it's a `git` URL) and how to build it (plugin: `go`).
+Other possible scenarios would be Bazaar or Mercurial branches, or local
+directories.
+
+### Mixing and matching plugins
+
+An interesting example is `py2-project` because it defines two parts
+`spongeshaker` using the `python2` plugin, and `make-project` using the
+`make` plugin.
+
+	parts:
+  	  spongeshaker:
+	    plugin: python2
+	    source: git://github.com/markokr/spongeshaker.git
+	  make-project:
+	    plugin: make
+	    source: .
+
+The example above mixes and matches parts of different origin. Locally it
+provides a binary we intend to ship (the `sha3sum.py` script) and a
+`Makefile` (to install our script in the right place).
+
+`spongeshaker` is a python library we will need to pull from git, build as
+a python project and bundle along with our script.
+
+A possible use-case for the above would be if you just intend to ship a small
+binary which you maintain, but require a library you need to build from git
+as opposed to simply including it from the Ubuntu archives.
+
+What's happening during the `snapcraft` run is:
+
+1. Get `spongeshaker` from `git`.
+1. Build it as a python project (which will include installing the python
+   library in the right place).
+1. Running `make` (from the local `Makefile`) and thus installing our
+   `sha3sum.py` script in the right place.
+
+### Putting your parts in order
+
+If your app is comprised of multiple parts, it might be necessary to build
+and stage parts in a particular order. This can be done by using the `after`
+keyword:
+
+	parts:
+	    pipelinetest:
+	        plugin: make
+	        source: lp:~mterry/+junk/pipelinetest
+	        after:
+	            - libpipeline
+	    libpipeline:
+	        plugin: autotools
+	        source: lp:~mterry/libpipeline/printf
+
+
+In the case of the `libpipeline` example above, the part named `pipelinetest`
+will be built after `libpipeline`. Especially if you need specific
+functionality during a build or as part of checks during the `stage` phase,
+this will be handy.
+
+### Re-using parts
+
+With snapcraft we want to make it easy to learn from other app vendors and
+re-use parts which have worked well for them.
+
+In the `downloader-with-wiki-parts` example, you can see that the `main`
+part is built:
+
+	        after:
+	            - curl
+
+As we never define the `curl` part in the above example, `snapcraft` will
+check the Ubuntu Wiki, which is where we currently host examples of
+successful snapcraft parts. The build order in this case would be `curl`,
+then `main`.
+
+
+## Finishing steps
+
+### Individual files
+
+If you are planning to provide binaries and services to the users of your
+apps, you need to specify them in your definition first. It's just a matter
+of enumerating them.
+
+The `godd` example has one binary:
+
+	binaries:
+	  godd:
+	    exec: ./bin/godd
+
+The above will take care of making the script executable, adding it to the
+user's path and install it in the right place.
+
+For a simple service we can take a look at `gopaste`:
+
+	services:
+	  gopaste:
+	    description: "gopaste"
+	    start: bin/gopasted
+
+You define a name for the service, describe it (so log messages are more
+descriptive), declare how to run the service and that's it. For more
+thoughts on services and their security, visit the
+[snappy policy](https://developer.ubuntu.com/en/snappy/guides/security-policy/).
+
+
+### Limiting the number of installed files
+
+To check the list of files included in your snap, you can use `unsquashfs -l`
+on the resulting `.snap` file. If you find that certain files should not be
+shipped to the user (download size being just one factor), you can
+explicitly tell `snapcraft` which files to snap:
+
+	    snap:
+	     - usr/lib/x86_64-linux-gnu/libgudev-1.0.so*
+	     - usr/lib/x86_64-linux-gnu/libobject-2.0.so*
+	     - usr/lib/x86_64-linux-gnu/libglib-2.0.so*
+	     - bin/godd*
+
+Here `godd` further defines the list of files to be placed in the app
+during the `snap` phase. As you can see above, globs (using asterisks as
+wildcard characters) are a good way of handling complexities within the
+directory structure.
+
+In the `webcam-webui` example you can see the following part called `cam`:
+
+	  cam:
+	    plugin: go
+	    go-packages:
+	        - github.com/mikix/golang-static-http
+	    stage-packages:
+	      - fswebcam
+	    filesets:
+	      fswebcam:
+	        - usr/bin/fswebcam
+	        - lib
+	        - usr/lib
+	      go-server:
+	        - bin/golang-*
+	    stage:
+	      - $fswebcam
+	      - $go-server
+	    snap:
+	      - $fswebcam
+	      - $go-server
+	      - -usr/share/doc
+
+In the `stage` definition you can see how named filesets are re-used
+(`$fswebcam` and `$go-server`).
+
+Another feature used in the `snap` definition is an exclude (`-usr/share/doc`
+in this case), meaning that files in these directories will not be installed.
+
+
+### node.js
+
+Snapping node.js apps has never been this easy. Take a look at the `shout`
+example and see how short and sweet it is. To bundle node packages, you simply
+do something like:
+
+	parts:
+	  shout:
+	    plugin: nodejs
+	    node-packages:
+	      - shout
+
+`node-packages` simply lists which packages (including their dependencies) to
+add to the snap.

=== added file 'md_importer/tests/data/snapcraft-test/docs/snapcraft-parts.md'
--- md_importer/tests/data/snapcraft-test/docs/snapcraft-parts.md	1970-01-01 00:00:00 +0000
+++ md_importer/tests/data/snapcraft-test/docs/snapcraft-parts.md	2016-01-19 00:21:38 +0000
@@ -0,0 +1,130 @@
+# Snapcraft parts
+
+Parts are the main building block to create snaps using Snapcraft. Parts have
+their own private space and lifecycle. Each part uses a `plugin`, which tells
+the part how to behave and what to do with the information inside it.
+
+As seen in the [article about snapcraft.yaml syntax](snapcraft-syntax.md)
+parts have general keywords that apply to all of them. In one case, you may
+want to enhance your part's functionality using `stage-packages` which end up
+bringing Ubuntu deb-based packages into your part, `filesets` to declare
+inclusion and exclusion sets, `organize` to make the artifact output for your
+part neater, `stage` and `snap` to make certain only the right set of files is
+seen at each step (making use of `filesets` or not). An example integrating
+these concepts for a part called `example-part` using a hypothetical plugin
+called `sample` would look like:
+
+	parts:
+	  example-part:
+	    type: sample
+	    stage-packages:
+	      - gpg
+	      - wget
+	    organize:
+	      opt/bin: bin
+	    filesets:
+	      binaries:
+	       - bin/*
+	       - usr/bin/*
+	      headers:
+	       - *.h
+	       - -include
+	    stage:
+	      - $binaries
+	      - test/bin/test_app
+	      - $headers
+	    snap:
+	      - $binaries
+ 
+In this example, imagine that the `sample` plugin actually builds something in
+its private *build* location using its private *source* directory as a base,
+and that it *installs* the usual set of files from its private install
+directory.
+
+This `sample` plugin makes use of `stage-packages`, these packages will be
+fetched from the Ubuntu deb archive using the *series* (release, i.e.; trusty,
+vivid, wily, ...) that is being used on the host. In this case, the part will
+be enhanced by the *gpg* and *wget* deb packages and its necessary
+dependencies to work isolated inside the part.
+
+When reaching the *stage* phase, the components in the private part's
+*install* directory will be exposed there, but since we used the organize
+keyword the contents in the install directory will be exposed to other parts
+in a cleaner form if desired or required; it is important to notice that in
+the event of using `filesets` they will follow the organized files and not
+the internal layout.
+
+The concept of `filesets` basically allows the creation of sets named after
+the keywords defined within, in this case *binaries* and *headers*, these are
+not necessarily needed but allow for variable expansion in the common
+targets: `stage` and `snap`. An inclusion is defined by just listing the
+target file, it can be globbed with `*` and a file can be explicitly
+excluded by prepending a `-` (when using `*` at the beginning of a path it
+needs to be quoted).
+
+The `stage` keyword will replace *$binaries* with all the *binaries* defined
+in `filesets`, but it also adds *test/bin/test_app* to the `stage` file set;
+*$headers* will basically *include* all the header files except those that
+live in *include* as it has a `-` in front of it. These are the files that
+will make it to the *stage* directory.
+
+The behavior for `snap` is identical to `stage` with the exception of applying
+this in the snap directory, which is the final layout for the snap, this is
+where everything should look clean and crisp for a good quality snap.
+
+
+## Snapcraft for Python with PIP
+
+Snapcraft includes support for Python 2.x and Python 3.x parts; here's how a
+`snapcraft.yaml` parts section will look like:
+
+	parts:
+	  spongeshaker:
+	    plugin: python3
+	    source: git://github.com/markokr/spongeshaker.git
+
+A Python part will typically make sure required Python packages are installed
+on the build host and embed the following pieces in your snap:
+
+ * latest Python runtime from the latest Ubuntu packages of your current
+   Ubuntu release
+ * latest PIP for this Python version as downloaded from PyPy
+ * latest versions of your PIP requirements
+
+The proper `PYTHONPATH` environment variable will also be set in the wrapper
+scripts generated by snapcraft or when running your app locally.
+
+Python parts support standard snapcraft options and the requirements option
+to point PIP at its requirements file.
+
+Why embed a Python runtime? While Snappy does currently include a Python 
+runtime, this might not be the one you need, and it might be updated to a
+different version or removed in a Snappy update. This is why applications
+using Python should embed their copy of the Python runtime.
+
+
+## Snapcraft for Java, Maven or Ant
+
+Snapcraft includes support for building parts with Apache Maven or Ant;
+here's how a snapcraft.yaml parts section will look like:
+
+	parts:
+	  webapp:
+	    plugin: maven
+	    source: git://github.com/lool/snappy-mvn-demo.git
+
+A Maven part will typically:
+
+ * make sure the tool is installed on the build host
+ * embed a Java runtime in your snap
+ * run `mvn package` and copy the resulting `*.jar` and `*.war` files in
+   your snaps `jar/` and `war/` directories
+
+An Ant part works similarly, except it runs ant and sets the proper
+`CLASSPATH` environment variable in the wrapper scripts generated by
+snapcraft or when running the app locally.
+
+If you only need to embed a Java runtime, add a part with the jdk type. This
+will pull a relocatable OpenJDK via the default-jdk Ubuntu package and will
+set the proper `JAVA_HOME` and `PATH` environment variables in wrapper
+scripts generated by snapcraft or when running the app locally.

=== added file 'md_importer/tests/data/snapcraft-test/docs/snapcraft-syntax.md'
--- md_importer/tests/data/snapcraft-test/docs/snapcraft-syntax.md	1970-01-01 00:00:00 +0000
+++ md_importer/tests/data/snapcraft-test/docs/snapcraft-syntax.md	2016-01-19 00:21:38 +0000
@@ -0,0 +1,83 @@
+# Syntax of the snapcraft.yaml file
+
+The `snapcraft.yaml` file is the main entry point to create a snap through
+Snapcraft. The main building blocks are parts and each defined part is
+independent from each other. In addition to parts, there are attributes
+that define the metadata for the snap package.
+
+What follows is a list of all the attributes the `snapcraft.yaml` file can
+contain.
+
+* `name` (string)  
+   The name of the resulting snap.
+* `version` (string)  
+   The version of the resulting snap.
+* `summary` (string)  
+   A 78 character long summary for the snap.
+* `description` (string)  
+   The description for the snap, this can and is expected to be a longer
+   explanation for the snap.
+* `config` (string)  
+   Path to the runnable in snap that will be used as the [Snappy config
+   interface](https://developer.ubuntu.com/snappy/guides/config-command/).
+* `services` (yaml subsection)  
+   A set of keys representing service names with values as defined by the
+   [Snappy packaging spec](https://developer.ubuntu.com/snappy/guides/packaging-format-apps/).
+* `binaries` (yaml subsection)  
+   A set of keys representing binary names with values as defined by the
+   [Snappy packaging spec](https://developer.ubuntu.com/snappy/guides/packaging-format-apps/).
+* `icon` (string)  
+   Path to the icon that will be used for the snap.
+* `license` (yaml subsection)  
+   License the snap will carry.
+    * `text` (string)  
+     The license text for the snap itself.
+    * `accept-required` (boolean)  
+     If true, license acceptance is required for the package to be activated.
+     A good example for this one is the Sun JRE/JDK being bundled in a snap.
+* `framework-policy` (string)  
+   A relative path to a directory containing additional policies, used if
+   creating a framework and want to extend permissions to snap apps.
+* `parts` (yaml subsection)  
+   A map of part names to their own part configuration. Order in the file is
+   not relevant (to aid copy-and-pasting).
+    * `plugin` (string)  
+     Specifies the plugin name that will manage this part. Snapcraft will pass
+     to it all the other user-specified part options. If plugin is not
+     defined, [the wiki](https://wiki.ubuntu.com/Snappy/Parts) will be
+     searched for the part, the local values defined in the part will be used
+     to compose the final part.
+    * `after` (list of strings)  
+     Specifies any parts that should be built before this part is. This is
+     mostly useful when a part needs a library or build tool built by another
+     part. If the part defined in after is not defined locally, the part will
+     be searched for in [the wiki](https://wiki.ubuntu.com/Snappy/Parts).
+     *If a part is supposed to run after another, the prerequisite part will
+     be staged before the dependent part starts its lifecycle.*
+    * `stage-packages` (list of strings)  
+     A list of Ubuntu packages to use that would support the part creation.
+    * `filesets` (yaml subsection)  
+     A dictionary with filesets, the key being a recognizable user defined
+     string and its value a list of strings of files to be included or
+     excluded. Globbing is achieved with `*` for either inclusions or
+     exclusion. Exclusions are denoted by a `-`. Globbing is computed from
+     the private sections of the part.
+    * `organize` (yaml subsection)  
+     A dictionary exposing replacements, the key is the internal name whilst
+     the value the exposed name, filesets will refer to the exposed named
+     applied after organization is applied.
+    * `stage` (list of strings)
+     A list of files from a part's installation to expose in stage. Rules
+     applying to the list here are the same as those of filesets. Referencing
+     of fileset keys is done with a $ prefixing the fileset key, which will
+     expand with the value of such key.
+    * `snap` (list of strings)  
+     A list of files from a part's installation to expose in snap. Rules
+     applying to the list here are the same as those of filesets. Referencing
+     of fileset keys is done with a `$` prefixing the fileset key, which will
+     expand with the value of such key.
+
+The `snapcraft.yaml` in any project is validated to be compliant to these
+keywords, if there is any missing expected component or invalid value,
+`snapcraft` will exit with an error.
+

=== added file 'md_importer/tests/data/snapcraft-test/docs/snapcraft-usage.md'
--- md_importer/tests/data/snapcraft-test/docs/snapcraft-usage.md	1970-01-01 00:00:00 +0000
+++ md_importer/tests/data/snapcraft-test/docs/snapcraft-usage.md	2016-01-19 00:21:38 +0000
@@ -0,0 +1,43 @@
+# Trying snapcraft
+
+In the example directory, you can look at each individual `snapcraft.yaml`
+to see how each project is composed. Within each of these directories try
+running `snapcraft` to build a snap for each of these or go through the
+lifecycle by running:
+
+	$ snapcraft pull
+	$ snapcraft build
+	$ snapcraft stage
+	$ snapcraft strip
+	$ snapcraft snap
+
+That sequence of commands basically went through the lifecycle of all the
+defined parts. To quickly inspect the parts a Snapcraft project has, open
+the `snapcraft.yaml` file of the corresponding example and look at the keys
+inside the parts entry.
+
+
+## Sideloading your snap
+
+Consider the `downloader-with-wiki-parts` example and a Snappy Ubuntu Core
+on 192.168.10.10, to install the built snap by following Trying snapcraft
+and run:
+
+	snappy-remote --url ssh://192.168.10.10 install downloader_1.0_amd64.snap
+
+If this is the first time connecting to the system, snappy-remote will try
+and use existing ssh keys for the user to avoid the necessity of password
+prompts.
+
+After installing a summary of installed snaps will be presented, on vanilla
+x86-64 bit system it would look a lot like this:
+
+	Name          Date       Version      Developer
+	ubuntu-core   2015-09-17 5            ubuntu
+	downloader    2015-10-01 ICIEPfXHQOaC sideload
+	generic-amd64 2015-10-01 1.4          canonical
+
+Take notice of the sideload word in the downloader snap, this indicates that
+the snap did not come signed from the store, if an app is sideloaded, it
+also fakes the version to allow easy iteration without the need to change the
+metadata.

=== added file 'md_importer/tests/data/snapcraft-test/docs/your-first-snap.md'
--- md_importer/tests/data/snapcraft-test/docs/your-first-snap.md	1970-01-01 00:00:00 +0000
+++ md_importer/tests/data/snapcraft-test/docs/your-first-snap.md	2016-01-19 00:21:38 +0000
@@ -0,0 +1,318 @@
+# Snapcraft Tutorial
+
+Let's make a snap from scratch using Snapcraft! We'll pick something a little
+interesting: a webcam server.
+
+## Preparation
+
+You'll want a webcam and a Snappy device. We'll assume you have those,
+but if you need help setting up a Snappy install, there is help
+[online](https://developer.ubuntu.com/en/snappy/start/).
+
+(Even if you don't have either of those, you can still follow along. You just
+won't be able to use the final snap package you create. But you'll get to see
+how Snapcraft works, which is still super rewarding.)
+
+## Approach
+
+This example is easy because we won't be doing much of the heavy lifting
+ourselves. We're going to integrate a couple pieces of code together to make
+an interesting app.
+
+Namely, we'll combine a web server with a webcam program and combine
+them to serve a new frame every ten seconds.
+
+> The resulting package is also part of the examples directory in the
+> [snapcraft sources](https://github.com/ubuntu-core/snapcraft/tree/master/examples/webcam-webui)
+
+### The Web Server
+
+Go has a simple web server in its standard libraries. So let's just use that.
+
+It's trivial to write a complete (but basic) web server in a few lines:
+
+    package main
+    import "net/http"
+    func main() {
+        panic(http.ListenAndServe(":8080", http.FileServer(http.Dir("."))))
+    }
+
+This will serve the current directory on port `:8080`. If there is an
+`index.html` in the current directory, it will be served. Otherwise a
+directory listing will be shown.