working on web development page

mattmakai · mattmakai · commit 5f7cbbec9e7e · 2015-11-15T12:55:49.000-08:00
diff --git a/all.html b/all.html
@@ -1266,17 +1266,30 @@ <h2>Comprehension resources</h2>
 </li>
 </ul>
           <h1>Web Development</h1>
-<p>Web development is the umbrella term for conceptualizing, designing, 
-programming, deploying and operating applications and application
-programming interfaces for the Web.</p>
+<p>Web development is the umbrella term for conceptualizing, creating, 
+<a href="/deployment.html">deploying</a> and operating web applications and 
+<a href="/application-programming-interfaces.html">application programming interfaces</a>
+for the Web.</p>
 <h2>Why is web development important?</h2>
 <p>The Web has grown a mindboggling amount in the number of sites, users and
 implementation capabilities since the 
 <a href="http://info.cern.ch/hypertext/WWW/TheProject.html">first website</a> went live
 in <a href="http://home.cern/topics/birth-web">1989</a>. Web development is the concept
 that encompasses all the activities involved with websites and web 
 applications.</p>
-<h3>Python web development resources</h3>
+<h2>How does Python fit into web development?</h2>
+<p>Python can be used to build server-side web applications. While a
+<a href="/web-frameworks.html">web framework</a> is not required to build web apps,
+it's rare that developers would not use existing open source libraries to
+speed up their progress in getting their application working.</p>
+<p>Python is not used in a web browser. The language executed in browsers
+such as Chrome, Firefox and Internet Explorer is 
+<a href="/javascript.html">JavaScript</a>. Projects such as <a href="http://pyjs.org/">pyjs</a> 
+can compile from Python to JavaScript. However, most Python developers are 
+write their web applications in a combination of Python, which is executed
+on the server side and JavaScript, which is downloaded to the web browser
+client and executed there.</p>
+<h3>Web development resources</h3>
 <ul>
 <li>
 <p><a href="https://medium.com/@zengabor/three-takeaways-for-web-developers-after-two-weeks-of-painfully-slow-internet-9e7f6d47726e">Three takeaways for web developers after two weeks of painfully slow Internet</a>
@@ -1285,7 +1298,11 @@ <h3>Python web development resources</h3>
   just in a subway tunnel. Optimizing sites so they work in those situations
   is important for keeping your users happy.</p>
 </li>
-<li></li>
+<li>
+<p>The <a href="http://www.evolutionoftheweb.com/">Evolution of the Web</a> visualizes 
+  how web browsers and related technologies have changed over time as well as
+  the overall growth of the Internet in the amount of data transferred.</p>
+</li>
 </ul>
           <h1>Web frameworks</h1>
 <p>A web framework is a code library that makes a developer's life easier when 
@@ -7316,6 +7333,9 @@ <h1>Change Log</h1>
 <h2>2015</h2>
 <h3>November</h3>
 <ul>
+<li>Working on a page for the umbrella <a href="/web-development.html">web development</a>
+  concept, but it's early days as I'm trying to figure out how to be clear
+  and concise about this broad topic.</li>
 <li>Merged 
   <a href="https://github.com/makaimc/fullstackpython.com/pull/70">pull request #70</a>
   and fixed some other issues that were in tickets.</li>
diff --git a/change-log.html b/change-log.html
@@ -39,6 +39,9 @@ <h1>Change Log</h1>
 <h2>2015</h2>
 <h3>November</h3>
 <ul>
+<li>Working on a page for the umbrella <a href="/web-development.html">web development</a>
+  concept, but it's early days as I'm trying to figure out how to be clear
+  and concise about this broad topic.</li>
 <li>Merged 
   <a href="https://github.com/makaimc/fullstackpython.com/pull/70">pull request #70</a>
   and fixed some other issues that were in tickets.</li>
diff --git a/feeds/all.atom.xml b/feeds/all.atom.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<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-11-15T12:41:35Z</updated></feed>
+<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-11-15T12:55:43Z</updated></feed>
diff --git a/source/content/pages/04-web-development/01-web-development.markdown b/source/content/pages/04-web-development/01-web-development.markdown
@@ -6,9 +6,10 @@ meta: Web development is the catch-all term for activities involved with website
 
 
 # Web Development
-Web development is the umbrella term for conceptualizing, designing, 
-programming, deploying and operating applications and application
-programming interfaces for the Web.
+Web development is the umbrella term for conceptualizing, creating, 
+[deploying](/deployment.html) and operating web applications and 
+[application programming interfaces](/application-programming-interfaces.html)
+for the Web.
 
 
 ## Why is web development important?
@@ -19,13 +20,28 @@ in [1989](http://home.cern/topics/birth-web). Web development is the concept
 that encompasses all the activities involved with websites and web 
 applications.
 
+## How does Python fit into web development?
+Python can be used to build server-side web applications. While a
+[web framework](/web-frameworks.html) is not required to build web apps,
+it's rare that developers would not use existing open source libraries to
+speed up their progress in getting their application working.
 
+Python is not used in a web browser. The language executed in browsers
+such as Chrome, Firefox and Internet Explorer is 
+[JavaScript](/javascript.html). Projects such as [pyjs](http://pyjs.org/) 
+can compile from Python to JavaScript. However, most Python developers are 
+write their web applications in a combination of Python, which is executed
+on the server side and JavaScript, which is downloaded to the web browser
+client and executed there.
 
-### Python web development resources
+
+### Web development resources
 * [Three takeaways for web developers after two weeks of painfully slow Internet](https://medium.com/@zengabor/three-takeaways-for-web-developers-after-two-weeks-of-painfully-slow-internet-9e7f6d47726e)
   is a must-read for every web developer. Not everyone has fast Internet
   service, whether because they are in a remote part of the world or they're
   just in a subway tunnel. Optimizing sites so they work in those situations
   is important for keeping your users happy.
 
-* 
+* The [Evolution of the Web](http://www.evolutionoftheweb.com/) visualizes 
+  how web browsers and related technologies have changed over time as well as
+  the overall growth of the Internet in the amount of data transferred.
diff --git a/source/content/pages/13-meta/02-change-log.markdown b/source/content/pages/13-meta/02-change-log.markdown
@@ -14,6 +14,9 @@ the
 
 ## 2015
 ### November
+* Working on a page for the umbrella [web development](/web-development.html)
+  concept, but it's early days as I'm trying to figure out how to be clear
+  and concise about this broad topic.
 * Merged 
   [pull request #70](https://github.com/makaimc/fullstackpython.com/pull/70)
   and fixed some other issues that were in tickets.
diff --git a/web-development.html b/web-development.html
@@ -32,17 +32,30 @@
 </div><div class="row">
     <div class="col-md-8">
           <h1>Web Development</h1>
-<p>Web development is the umbrella term for conceptualizing, designing, 
-programming, deploying and operating applications and application
-programming interfaces for the Web.</p>
+<p>Web development is the umbrella term for conceptualizing, creating, 
+<a href="/deployment.html">deploying</a> and operating web applications and 
+<a href="/application-programming-interfaces.html">application programming interfaces</a>
+for the Web.</p>
 <h2>Why is web development important?</h2>
 <p>The Web has grown a mindboggling amount in the number of sites, users and
 implementation capabilities since the 
 <a href="http://info.cern.ch/hypertext/WWW/TheProject.html">first website</a> went live
 in <a href="http://home.cern/topics/birth-web">1989</a>. Web development is the concept
 that encompasses all the activities involved with websites and web 
 applications.</p>
-<h3>Python web development resources</h3>
+<h2>How does Python fit into web development?</h2>
+<p>Python can be used to build server-side web applications. While a
+<a href="/web-frameworks.html">web framework</a> is not required to build web apps,
+it's rare that developers would not use existing open source libraries to
+speed up their progress in getting their application working.</p>
+<p>Python is not used in a web browser. The language executed in browsers
+such as Chrome, Firefox and Internet Explorer is 
+<a href="/javascript.html">JavaScript</a>. Projects such as <a href="http://pyjs.org/">pyjs</a> 
+can compile from Python to JavaScript. However, most Python developers are 
+write their web applications in a combination of Python, which is executed
+on the server side and JavaScript, which is downloaded to the web browser
+client and executed there.</p>
+<h3>Web development resources</h3>
 <ul>
 <li>
 <p><a href="https://medium.com/@zengabor/three-takeaways-for-web-developers-after-two-weeks-of-painfully-slow-internet-9e7f6d47726e">Three takeaways for web developers after two weeks of painfully slow Internet</a>
@@ -51,7 +64,11 @@ <h3>Python web development resources</h3>
   just in a subway tunnel. Optimizing sites so they work in those situations
   is important for keeping your users happy.</p>
 </li>
-<li></li>
+<li>
+<p>The <a href="http://www.evolutionoftheweb.com/">Evolution of the Web</a> visualizes 
+  how web browsers and related technologies have changed over time as well as
+  the overall growth of the Internet in the amount of data transferred.</p>
+</li>
 </ul>
 <h3>Let's get started. What do you want to learn right now?</h3>
 <div class="row">

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`<?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-11-15T12:41:35Z</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-11-15T12:55:43Z</updated></feed>`