Repository: mockup
Branch: refs/heads/master
Date: 2014-12-14T22:16:41+01:00
Author: Fulvio Casali (fulv) <fulviocasali@gmail.com>
Commit: https://github.com/plone/mockup/commit/00b28515867ffeb4cca593956427d0d1f998e739

Fix a one-letter typo.  Mostly making sure I can do the git workflow.

Files changed:
M mockup/js/bundles/docs.js

diff --git a/mockup/js/bundles/docs.js b/mockup/js/bundles/docs.js
index 2a5961a..84964bf 100644
--- a/mockup/js/bundles/docs.js
+++ b/mockup/js/bundles/docs.js
@@ -69,7 +69,7 @@ require([
           },
           { id: 'markspeciallinks',
             title: 'Mark special links',
-            description: 'Mark special links based on protocoll and optionally open in new window.',
+            description: 'Mark special links based on protocol and optionally open in new window.',
             url: 'patterns/markspeciallinks/pattern.js'
           },
           { id: 'modal',


Repository: mockup
Branch: refs/heads/master
Date: 2014-12-14T20:52:32-06:00
Author: Nathan Van Gheem (vangheem) <vangheem@gmail.com>
Commit: https://github.com/plone/mockup/commit/6c5d782fdc73d34c27cdb5db4ac62cd28e3f18cb

Merge pull request #448 from plone/fulv-fixtypo

Fix a one-letter typo.  Mostly making sure I can do the git workflow.

Files changed:
M mockup/js/bundles/docs.js

diff --git a/mockup/js/bundles/docs.js b/mockup/js/bundles/docs.js
index 2a5961a..84964bf 100644
--- a/mockup/js/bundles/docs.js
+++ b/mockup/js/bundles/docs.js
@@ -69,7 +69,7 @@ require([
           },
           { id: 'markspeciallinks',
             title: 'Mark special links',
-            description: 'Mark special links based on protocoll and optionally open in new window.',
+            description: 'Mark special links based on protocol and optionally open in new window.',
             url: 'patterns/markspeciallinks/pattern.js'
           },
           { id: 'modal',