Skip to content

Commit a7dbcbe

Browse files
committed
moving livecoding to videos page
1 parent 3e45fc0 commit a7dbcbe

File tree

6 files changed

+34
-30
lines changed

6 files changed

+34
-30
lines changed

all.html

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -385,16 +385,6 @@ <h2>New to programming</h2>
385385
should skip down to the next section for "experienced developers".</p>
386386
<ul>
387387
<li>
388-
<p>Learn by watching a Python developer code live. Follow my
389-
account on <a href="https://www.livecoding.tv/mattmakai/">livecoding.tv</a> and
390-
you'll receive an email alert when I
391-
<a href="https://github.com/makaimc/compare-python-web-frameworks">compare Python web frameworks</a>,
392-
<a href="https://github.com/makaimc/plapi">build a web API with Django and Django REST Framework</a>
393-
and
394-
write new pages for
395-
<a href="https://github.com/makaimc/fullstackpython.com">Full Stack Python</a>.</p>
396-
</li>
397-
<li>
398388
<p>To get an introduction to Python, Django and Flask at the same time,
399389
consider purchasing the
400390
<a href="https://realpython.com/?utm_source=fsp&utm_medium=promo&utm_campaign=bestresources" onclick="trackOutboundLink('https://www.realpython.com/?utm_source=fsp&utm_medium=promo&utm_campaign=bestresources'); return false;">Real Python</a>
@@ -598,6 +588,17 @@ <h1>Best Python Videos</h1>
598588
to learn more about web development.
599589
</div>
600590

591+
<h2>Livecoding</h2>
592+
<ul>
593+
<li>Learn by watching a Python developer code live. Follow my
594+
account on <a href="https://www.livecoding.tv/mattmakai/">livecoding.tv</a> and
595+
you'll receive an email alert when I
596+
<a href="https://github.com/makaimc/compare-python-web-frameworks">compare Python web frameworks</a>,
597+
<a href="https://github.com/makaimc/plapi">build a web API with Django and Django REST Framework</a>
598+
and
599+
write new pages for
600+
<a href="https://github.com/makaimc/fullstackpython.com">Full Stack Python</a>.</li>
601+
</ul>
601602
<h2>Web development with Django, Flask and other frameworks</h2>
602603
<ul>
603604
<li>

best-python-resources.html

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -51,16 +51,6 @@ <h2>New to programming</h2>
5151
should skip down to the next section for "experienced developers".</p>
5252
<ul>
5353
<li>
54-
<p>Learn by watching a Python developer code live. Follow my
55-
account on <a href="https://www.livecoding.tv/mattmakai/">livecoding.tv</a> and
56-
you'll receive an email alert when I
57-
<a href="https://github.com/makaimc/compare-python-web-frameworks">compare Python web frameworks</a>,
58-
<a href="https://github.com/makaimc/plapi">build a web API with Django and Django REST Framework</a>
59-
and
60-
write new pages for
61-
<a href="https://github.com/makaimc/fullstackpython.com">Full Stack Python</a>.</p>
62-
</li>
63-
<li>
6454
<p>To get an introduction to Python, Django and Flask at the same time,
6555
consider purchasing the
6656
<a href="https://realpython.com/?utm_source=fsp&utm_medium=promo&utm_campaign=bestresources" onclick="trackOutboundLink('https://www.realpython.com/?utm_source=fsp&utm_medium=promo&utm_campaign=bestresources'); return false;">Real Python</a>

best-python-videos.html

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,17 @@ <h1>Best Python Videos</h1>
4747
to learn more about web development.
4848
</div>
4949

50+
<h2>Livecoding</h2>
51+
<ul>
52+
<li>Learn by watching a Python developer code live. Follow my
53+
account on <a href="https://www.livecoding.tv/mattmakai/">livecoding.tv</a> and
54+
you'll receive an email alert when I
55+
<a href="https://github.com/makaimc/compare-python-web-frameworks">compare Python web frameworks</a>,
56+
<a href="https://github.com/makaimc/plapi">build a web API with Django and Django REST Framework</a>
57+
and
58+
write new pages for
59+
<a href="https://github.com/makaimc/fullstackpython.com">Full Stack Python</a>.</li>
60+
</ul>
5061
<h2>Web development with Django, Flask and other frameworks</h2>
5162
<ul>
5263
<li>

feeds/all.atom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<feed xmlns="http://www.w3.org/2005/Atom"><title>Matt Makai</title><link href="http://www.fullstackpython.com/" rel="alternate"></link><link href="http://www.fullstackpython.com/feeds/all.atom.xml" rel="self"></link><id>http://www.fullstackpython.com/</id><updated>2015-10-28T13:33:01Z</updated></feed>
2+
<feed xmlns="http://www.w3.org/2005/Atom"><title>Matt Makai</title><link href="http://www.fullstackpython.com/" rel="alternate"></link><link href="http://www.fullstackpython.com/feeds/all.atom.xml" rel="self"></link><id>http://www.fullstackpython.com/</id><updated>2015-10-28T14:34:20Z</updated></feed>

source/content/pages/01-introduction/06-best-python-resources.markdown

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,6 @@ If you're learning your first programming language these books were written
2727
with you in mind. Developers learning Python as a second or later language
2828
should skip down to the next section for "experienced developers".
2929

30-
* Learn by watching a Python developer code live. Follow my
31-
account on [livecoding.tv](https://www.livecoding.tv/mattmakai/) and
32-
you'll receive an email alert when I
33-
[compare Python web frameworks](https://github.com/makaimc/compare-python-web-frameworks),
34-
[build a web API with Django and Django REST Framework](https://github.com/makaimc/plapi)
35-
and
36-
write new pages for
37-
[Full Stack Python](https://github.com/makaimc/fullstackpython.com).
38-
3930
* To get an introduction to Python, Django and Flask at the same time,
4031
consider purchasing the
4132
<a href="https://realpython.com/?utm_source=fsp&utm_medium=promo&utm_campaign=bestresources" onclick="trackOutboundLink('https://www.realpython.com/?utm_source=fsp&utm_medium=promo&utm_campaign=bestresources'); return false;">Real Python</a>

source/content/pages/01-introduction/07-best-python-videos.markdown

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,17 @@ to learn more about web development.
2424
</div>
2525

2626

27+
## Livecoding
28+
* Learn by watching a Python developer code live. Follow my
29+
account on [livecoding.tv](https://www.livecoding.tv/mattmakai/) and
30+
you'll receive an email alert when I
31+
[compare Python web frameworks](https://github.com/makaimc/compare-python-web-frameworks),
32+
[build a web API with Django and Django REST Framework](https://github.com/makaimc/plapi)
33+
and
34+
write new pages for
35+
[Full Stack Python](https://github.com/makaimc/fullstackpython.com).
36+
37+
2738
## Web development with Django, Flask and other frameworks
2839
* [Kate Heddleston](https://twitter.com/heddle317) gave a talk at PyCon 2014
2940
called

0 commit comments

Comments
 (0)