diff --git a/docs/_data/nav_docs.yml b/docs/_data/nav_docs.yml index 8b4acecef57dc..fcde3e374f71e 100644 --- a/docs/_data/nav_docs.yml +++ b/docs/_data/nav_docs.yml @@ -8,6 +8,8 @@ title: Thinking in React - title: Community Resources items: + - id: conferences + title: Conferences - id: videos title: Videos - id: complementary-tools diff --git a/docs/docs/conferences.md b/docs/docs/conferences.md new file mode 100644 index 0000000000000..d2c5297e01acf --- /dev/null +++ b/docs/docs/conferences.md @@ -0,0 +1,19 @@ +--- +id: conferences +title: Conferences +permalink: conferences.html +prev: thinking-in-react.html +next: videos.html +--- + +### React.js Conf 2015 +January 28 & 29 + +[Website](http://conf.reactjs.com/) - [Schedule](http://conf.reactjs.com/schedule.html) - [Videos](https://www.youtube.com/playlist?list=PLb0IAmt7-GS1cbw4qonlQztYV1TAW0sCr) + +<iframe width="650" height="315" src="//www.youtube.com/embed/KVZ-P-ZI6W4?list=PLb0IAmt7-GS1cbw4qonlQztYV1TAW0sCr" frameborder="0" allowfullscreen></iframe> + +### ReactEurope 2015 +July 2 & 3 + +[Website](http://www.react-europe.org/) - [Schedule](http://www.react-europe.org/#schedule) diff --git a/docs/docs/thinking-in-react.md b/docs/docs/thinking-in-react.md index e5518d5b7ad7e..6d2dc87cb818d 100644 --- a/docs/docs/thinking-in-react.md +++ b/docs/docs/thinking-in-react.md @@ -2,7 +2,7 @@ id: thinking-in-react title: Thinking in React prev: tutorial.html -next: videos.html +next: conferences.html --- This was originally a [blog post](/react/blog/2013/11/05/thinking-in-react.html) from the [official React blog](/react/blog). diff --git a/docs/docs/videos.md b/docs/docs/videos.md index 8036b10457090..c15a78dad7703 100644 --- a/docs/docs/videos.md +++ b/docs/docs/videos.md @@ -2,7 +2,7 @@ id: videos title: Videos permalink: videos.html -prev: thinking-in-react.html +prev: conferences.html next: complementary-tools.html ---