Merge pull request #890 from petele/master

Fixes #771 in for video article (English only)

Author: PaulKinlan

content/tutorials/video/basics/en/index.html

@@ -0,0 +1,89 @@
+WEBVTT FILE
+
+1
+00:00:00.500 --> 00:00:02.000 D:vertical A:start
+The Web is always changing
+
+2
+00:00:02.500 --> 00:00:04.300
+and the way we access it is changing
+
+3
+00:00:05.000 --> 00:00:07.000
+The source of that change is <c.highlight>you</c>
+
+4
+00:00:07.100 --> 00:00:11.000
+Developers all around the world who are using our tools to create great new things
+
+5
+00:00:11.200 --> 00:00:13.200
+and with so many tools, the sky is the limit
+
+6
+00:00:14.500 --> 00:00:16.500
+But it cant happen without you and your ideas
+
+7
+00:00:17.500 --> 00:00:18.700
+We want to know you better
+
+8
+00:00:18.700 --> 00:00:21.000 
+so we created a new place just for that
+
+9
+00:00:21.000 --> 00:00:22.000 
+to hear from <u>you</u>
+
+10
+00:00:22.500 --> 00:00:25.000 
+We want to hear what inspires you as a developer
+
+11
+00:00:25.500 --> 00:00:27.000 
+and how we can help.
+
+12
+00:00:27.000 --> 00:00:30.800 
+Here you can record a video, share stories with us and more
+
+13
+00:00:31.000 --> 00:00:34.000 
+Let us know what being a Google developer means to you
+
+14
+00:00:34.000 --> 00:00:38.200 
+and you can talk to us in person at Google Developer events all over the world.
+
+15
+00:00:38.500 --> 00:00:41.000 
+so we can learn how to support you better.
+
+16
+00:00:41.000 --> 00:00:44.600 
+Oh, btw, we also started rolling a new site for Google Developers
+
+17
+00:00:44.700 --> 00:00:49.400 
+Not just code but community, news, tools and other resources
+
+18
+00:00:49.400 --> 00:00:51.000 
+and cake
+
+19
+00:00:51.200 --> 00:00:54.000 
+Like any open source project it's a work in progress
+
+20
+00:00:54.100 --> 00:00:57.000 
+with your help it can be great
+
+21
+00:00:57.000 --> 00:01:00.000 L:12%
+developers.google.com/stories
+
+21
+00:01:00.500 --> 00:01:04.000 
+Change is important to the Web. Help us keep changing it together

content/tutorials/video/basics/static/devstories-en.vtt

@@ -411,11 +411,11 @@ org:
   name: Google
   unit: Developer Relations
 address:
-  locality: Mountain View
-  region: California
+  locality: New York
+  region: New York
   country: USA
-  lat: 37.42192
-  lon: -122.087824
+  lat: 40.7401088
+  lon: -73.9999461
 homepage: http://petelepage.com
 google: 117555368223516714643
 twitter: petele
@@ -610,6 +610,7 @@ name:
   family: Hansa
 org:
   name: Shazam
+  unit: Developer
 address:
   locality: London
   region: London
@@ -620,7 +621,7 @@ homepage: https://github.com/umaar
 google: 111696301786817020074
 twitter: umaar
 email: [email protected]
-lanyrd: umaar
+lanyrd: true
 
 ---
 
@@ -1507,6 +1508,7 @@ name:
   family: Ristic
 org:
   name: PubNub
+  unit: Developer
 address:
   locality: San Francisco Bay Area
   region: California
@@ -1518,6 +1520,8 @@ google: https://plus.sandbox.google.com/114912976335164759315/posts
 twitter: dristic101
 email:
 
+---
+
 id: einaroberg
 name:
   given: Einar
@@ -1535,4 +1539,3 @@ homepage: http://www.northkingdom.com/
 google: 114004301012583596640
 twitter: inear
 email: [email protected]
->>>>>>> 284447b49e981e7acb33b90bd224df0125a5c0d9

content/tutorials/video/basics/static/devstories.mp4

@@ -2331,14 +2331,17 @@ tags:
 
 title: HTML5 Video
 url: /tutorials/video/basics/
-author_id: ernestd
+author_id: petele
+author_id2: ernestd
 publication_date: 2010-08-03
+update_date: 2014-01-10
 description: Video is one of the most interesting and widely supported features of HTML5. This tutorial covers the mechanics of incorporating native video into your site (without a plugin) and gives interesting examples of using the >video< tag.
 browser_support:
 - chrome
 - opera
 - safari
 - ff
+- ie
 tags:
 - video
 - class:multimedia