major update to Vim page. 1000th commit wooo

all.html

@@ -635,14 +635,24 @@ <h2>Configuring Vim with a Vimrc file</h2>
 </pre></div>
 
 
+<p>Here is how these configuration options look with a dark background on 
+Mac OS X while editing the markdown for this webpage (how meta!).</p>
+<p><img src="theme/img/vim-dark-bg.jpg" width="100%" alt="Vim with basic configuration options on a dark background." class="technical-diagram" style="border-radius: 5px;"></p>
+<p>Take a look at another example using these configuration options, this time
+with a light background and editing Python code from my 
+<a href="https://github.com/makaimc/choose-your-own-adventure-presentations">Choose Your Own Adventures Presentations</a>
+project.</p>
+<p><img src="theme/img/vim-white-bg.png" width="100%" alt="Vim with basic configuration options on a white background." class="technical-diagram" style="border-radius: 5px; border: 1px solid #999;"></p>
 <p>The Vimrc file lives under the home directory of the user account running
 Vim. For example, when my user account is 'matt', on Mac OS X my Vimrc
-file is found at <code>/Users/matt/.vimrc</code>. On Ubuntu Linux my Vimrc file
-can be found within <code>/home/matt/.vimrc</code>. </p>
-<p>If the Vimrc file does not already exist, just create it within the user's
-home directory and it will be picked up by Vim the next time you start the
-program.</p>
-<h2>General Vim resources</h2>
+file is found at <code>/Users/matt/.vimrc</code>. On Ubuntu Linux my .vimrc file
+can be found within the <code>/home/matt/</code> directory. </p>
+<p>If a Vimrc file does not already exist, just create it within the user's
+home directory and it will be picked up by Vim the next time you open the
+editor.</p>
+<h2>Vim tutorials</h2>
+<p>Vim has a reputation for a difficult learning curve, but it's much easier
+to get started with these tutorials.</p>
 <ul>
 <li>
 <p><a href="http://vim-adventures.com/">Vim Adventures</a> is a cute, fun browser-based
@@ -659,15 +669,6 @@ <h2>General Vim resources</h2>
   incredibly deep study in how to go from beginner to knowledgeable in Vim.</p>
 </li>
 <li>
-<p><a href="http://haridas.in/vim-as-your-ide.html">Vim as Your IDE</a> discusses how to
-  set up Vim for greater productivity once you learn the initial Vim language 
-  for using the editor.</p>
-</li>
-<li>
-<p><a href="http://stackoverflow.com/questions/9172802/setting-up-vim-for-python">Setting up Vim for Python</a>
-  has a well written answer on Stack Overflow for getting started with Vim.</p>
-</li>
-<li>
 <p><a href="http://benmccormick.org/2014/07/02/learning-vim-in-2014-vim-as-language/">Vim as a Language</a>
   explains the language syntax and how you can build up over time to master
   the editor.</p>
@@ -679,7 +680,40 @@ <h2>General Vim resources</h2>
   code editting tool.</p>
 </li>
 </ul>
+<h2>Vim Python IDE bundles and resources</h2>
+<p>Once you get comfortable with Vim as an editor, there are several 
+configuration options and plugins you can use to enhance your Python 
+productivity. These are the resources and tutorials to read when you're
+ready to take that step.</p>
+<ul>
+<li>
+<p>The <a href="https://github.com/klen/python-mode">python-mode</a> project is a Vim
+  plugin with syntax highlighting, breakpoints, PEP8 linting, code completion
+  and many other features you'd expect from an integrated development
+  environment.</p>
+</li>
+<li>
+<p><a href="https://github.com/gmarik/Vundle.vim">Vundle</a> comes highly recommended
+  as a plug-in manager for Vim.</p>
+</li>
+<li>
+<p><a href="http://haridas.in/vim-as-your-ide.html">Vim as Your IDE</a> discusses how to
+  set up Vim for greater productivity once you learn the initial Vim language 
+  for using the editor.</p>
+</li>
+<li>
+<p><a href="unlogic.co.uk/2013/02/08/vim-as-a-python-ide/">Vim as a Python IDE</a>
+  goes through the steps necessary to make Vim into a more comfortable 
+  environment for Python development.</p>
+</li>
+<li>
+<p><a href="http://stackoverflow.com/questions/9172802/setting-up-vim-for-python">Setting up Vim for Python</a>
+  has a well written answer on Stack Overflow for getting started with Vim.</p>
+</li>
+</ul>
 <h2>Vim installation guides</h2>
+<p>These installation guides will help you get Vim up and running on Mac OS X, 
+Linux and Windows.</p>
 <ul>
 <li>
 <p><a href="http://prioritized.net/blog/upgrading-vim-on-os-x/">Upgrading Vim on OS X</a>
@@ -697,6 +731,9 @@ <h2>Vim installation guides</h2>
 </li>
 </ul>
 <h2>Vimrc resources</h2>
+<p>These are a few resources for learning how to structure a .vimrc file. I
+recommend adding configuration options one at a time to test them 
+individually instead of going whole hog with a Vimrc you are unfamiliar with.</p>
 <ul>
 <li>
 <p><a href="http://dougblack.io/words/a-good-vimrc.html">A Good Vimrc</a> is a fantastic,
@@ -707,6 +744,11 @@ <h2>Vimrc resources</h2>
 <p><a href="https://justin.abrah.ms/vim/vim_and_python.html">Vim and Python</a> shows
   and explains many Python-specific .vimrc options.</p>
 </li>
+<li>
+<p>This 
+  <a href="https://github.com/amix/vimrc/tree/master/vimrcs">repository's folder with Vimrc files</a>
+  has example configurations that are well commented and easy to learn from. </p>
+</li>
 </ul>
 <h2>Vim Plugin resources</h2>
 <ul>
@@ -721,6 +763,10 @@ <h2>Vim Plugin resources</h2>
   usefulness. The comments at the bottom are also interesting as people have
   suggested alternatives to some of the plugins mentioned in the post.</p>
 </li>
+<li>
+<p><a href="https://github.com/powerline/powerline">Powerline</a> is a popular statusline
+  plugin for Vim that works with both Python 2 and 3.</p>
+</li>
 </ul>
 <h3>What do you want to learn about Python development?</h3>
                   <h1>Emacs</h1>
@@ -5439,6 +5485,8 @@ <h1>Change Log</h1>
 <h2>2015</h2>
 <h3>March</h3>
 <ul>
+<li>Major update to <a href="/vim.html">Vim</a> page to add screenshots, a better example
+  .vimrc configuration and many more resources.</li>
 <li>Updated the <a href="/web-analytics.html">web analytics</a> page with a new 
   Python-specific section for walkthroughs that are specific to building or
   using analytics with Python applications.</li>

change-log.html

@@ -46,6 +46,8 @@ <h1>Change Log</h1>
 <h2>2015</h2>
 <h3>March</h3>
 <ul>
+<li>Major update to <a href="/vim.html">Vim</a> page to add screenshots, a better example
+  .vimrc configuration and many more resources.</li>
 <li>Updated the <a href="/web-analytics.html">web analytics</a> page with a new 
   Python-specific section for walkthroughs that are specific to building or
   using analytics with Python applications.</li>

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-03-21T11:46:29Z</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-03-21T13:21:15Z</updated></feed>

source/content/pages/02-learning-programming/05-vim.markdown

@@ -79,18 +79,34 @@ to get a feel for some of the configuration statements:
     let python_highlight_all = 1
 
 
+Here is how these configuration options look with a dark background on 
+Mac OS X while editing the markdown for this webpage (how meta!).
+
+<img src="theme/img/vim-dark-bg.jpg" width="100%" alt="Vim with basic configuration options on a dark background." class="technical-diagram" style="border-radius: 5px;">
+
+Take a look at another example using these configuration options, this time
+with a light background and editing Python code from my 
+[Choose Your Own Adventures Presentations](https://github.com/makaimc/choose-your-own-adventure-presentations)
+project.
+
+<img src="theme/img/vim-white-bg.png" width="100%" alt="Vim with basic configuration options on a white background." class="technical-diagram" style="border-radius: 5px; border: 1px solid #999;">
+
+
+
 The Vimrc file lives under the home directory of the user account running
 Vim. For example, when my user account is 'matt', on Mac OS X my Vimrc
-file is found at ``/Users/matt/.vimrc``. On Ubuntu Linux my Vimrc file
-can be found within ``/home/matt/.vimrc``. 
+file is found at ``/Users/matt/.vimrc``. On Ubuntu Linux my .vimrc file
+can be found within the ``/home/matt/`` directory. 
 
-If the Vimrc file does not already exist, just create it within the user's
-home directory and it will be picked up by Vim the next time you start the
-program.
+If a Vimrc file does not already exist, just create it within the user's
+home directory and it will be picked up by Vim the next time you open the
+editor.
 
 
+## Vim tutorials
+Vim has a reputation for a difficult learning curve, but it's much easier
+to get started with these tutorials.
 
-## General Vim resources
 * [Vim Adventures](http://vim-adventures.com/) is a cute, fun browser-based
   game that helps you learn Vim commands by playing through the adventure.
 
@@ -102,13 +118,6 @@ program.
 * [A vim Tutorial and Primer](https://danielmiessler.com/study/vim/) is an
   incredibly deep study in how to go from beginner to knowledgeable in Vim.
 
-* [Vim as Your IDE](http://haridas.in/vim-as-your-ide.html) discusses how to
-  set up Vim for greater productivity once you learn the initial Vim language 
-  for using the editor.
-
-* [Setting up Vim for Python](http://stackoverflow.com/questions/9172802/setting-up-vim-for-python)
-  has a well written answer on Stack Overflow for getting started with Vim.
-
 * [Vim as a Language](http://benmccormick.org/2014/07/02/learning-vim-in-2014-vim-as-language/)
   explains the language syntax and how you can build up over time to master
   the editor.
@@ -119,7 +128,36 @@ program.
   code editting tool.
 
 
+## Vim Python IDE bundles and resources
+Once you get comfortable with Vim as an editor, there are several 
+configuration options and plugins you can use to enhance your Python 
+productivity. These are the resources and tutorials to read when you're
+ready to take that step.
+
+* The [python-mode](https://github.com/klen/python-mode) project is a Vim
+  plugin with syntax highlighting, breakpoints, PEP8 linting, code completion
+  and many other features you'd expect from an integrated development
+  environment.
+
+* [Vundle](https://github.com/gmarik/Vundle.vim) comes highly recommended
+  as a plug-in manager for Vim.
+
+* [Vim as Your IDE](http://haridas.in/vim-as-your-ide.html) discusses how to
+  set up Vim for greater productivity once you learn the initial Vim language 
+  for using the editor.
+
+* [Vim as a Python IDE](unlogic.co.uk/2013/02/08/vim-as-a-python-ide/)
+  goes through the steps necessary to make Vim into a more comfortable 
+  environment for Python development.
+
+* [Setting up Vim for Python](http://stackoverflow.com/questions/9172802/setting-up-vim-for-python)
+  has a well written answer on Stack Overflow for getting started with Vim.
+
+
 ## Vim installation guides
+These installation guides will help you get Vim up and running on Mac OS X, 
+Linux and Windows.
+
 * [Upgrading Vim on OS X](http://prioritized.net/blog/upgrading-vim-on-os-x/)
   explains why to upgrade from Vim 7.2 to 7.3+ and how to do it using 
   [Homebrew](http://brew.sh/).
@@ -133,13 +171,21 @@ program.
 
 
 ## Vimrc resources
+These are a few resources for learning how to structure a .vimrc file. I
+recommend adding configuration options one at a time to test them 
+individually instead of going whole hog with a Vimrc you are unfamiliar with.
+
 * [A Good Vimrc](http://dougblack.io/words/a-good-vimrc.html) is a fantastic,
   detailed overview and opinionated guide to configuring Vim. Highly 
   recommended for new and experienced Vim users.
 
 * [Vim and Python](https://justin.abrah.ms/vim/vim_and_python.html) shows
   and explains many Python-specific .vimrc options.
 
+* This 
+  [repository's folder with Vimrc files](https://github.com/amix/vimrc/tree/master/vimrcs)
+  has example configurations that are well commented and easy to learn from. 
+
 
 ## Vim Plugin resources
 * [5 Essential VIM Plugins That Greatly Increase my Productivity](http://joelhooks.com/blog/2013/04/23/5-essential-vim-plugins/)
@@ -151,5 +197,8 @@ program.
   usefulness. The comments at the bottom are also interesting as people have
   suggested alternatives to some of the plugins mentioned in the post.
 
+* [Powerline](https://github.com/powerline/powerline) is a popular statusline
+  plugin for Vim that works with both Python 2 and 3.
+
 
 ### What do you want to learn about Python development?

source/content/pages/13-meta/02-change-log.markdown

@@ -26,6 +26,8 @@ the
 
 ## 2015
 ### March
+* Major update to [Vim](/vim.html) page to add screenshots, a better example
+  .vimrc configuration and many more resources.
 * Updated the [web analytics](/web-analytics.html) page with a new 
   Python-specific section for walkthroughs that are specific to building or
   using analytics with Python applications.

vim.html

@@ -94,14 +94,24 @@ <h2>Configuring Vim with a Vimrc file</h2>
 </pre></div>
 
 
+<p>Here is how these configuration options look with a dark background on 
+Mac OS X while editing the markdown for this webpage (how meta!).</p>
+<p><img src="theme/img/vim-dark-bg.jpg" width="100%" alt="Vim with basic configuration options on a dark background." class="technical-diagram" style="border-radius: 5px;"></p>
+<p>Take a look at another example using these configuration options, this time
+with a light background and editing Python code from my 
+<a href="https://github.com/makaimc/choose-your-own-adventure-presentations">Choose Your Own Adventures Presentations</a>
+project.</p>
+<p><img src="theme/img/vim-white-bg.png" width="100%" alt="Vim with basic configuration options on a white background." class="technical-diagram" style="border-radius: 5px; border: 1px solid #999;"></p>
 <p>The Vimrc file lives under the home directory of the user account running
 Vim. For example, when my user account is 'matt', on Mac OS X my Vimrc
-file is found at <code>/Users/matt/.vimrc</code>. On Ubuntu Linux my Vimrc file
-can be found within <code>/home/matt/.vimrc</code>. </p>
-<p>If the Vimrc file does not already exist, just create it within the user's
-home directory and it will be picked up by Vim the next time you start the
-program.</p>
-<h2>General Vim resources</h2>
+file is found at <code>/Users/matt/.vimrc</code>. On Ubuntu Linux my .vimrc file
+can be found within the <code>/home/matt/</code> directory. </p>
+<p>If a Vimrc file does not already exist, just create it within the user's
+home directory and it will be picked up by Vim the next time you open the
+editor.</p>
+<h2>Vim tutorials</h2>
+<p>Vim has a reputation for a difficult learning curve, but it's much easier
+to get started with these tutorials.</p>
 <ul>
 <li>
 <p><a href="http://vim-adventures.com/">Vim Adventures</a> is a cute, fun browser-based
@@ -118,15 +128,6 @@ <h2>General Vim resources</h2>
   incredibly deep study in how to go from beginner to knowledgeable in Vim.</p>
 </li>
 <li>
-<p><a href="http://haridas.in/vim-as-your-ide.html">Vim as Your IDE</a> discusses how to
-  set up Vim for greater productivity once you learn the initial Vim language 
-  for using the editor.</p>
-</li>
-<li>
-<p><a href="http://stackoverflow.com/questions/9172802/setting-up-vim-for-python">Setting up Vim for Python</a>
-  has a well written answer on Stack Overflow for getting started with Vim.</p>
-</li>
-<li>
 <p><a href="http://benmccormick.org/2014/07/02/learning-vim-in-2014-vim-as-language/">Vim as a Language</a>
   explains the language syntax and how you can build up over time to master
   the editor.</p>
@@ -138,7 +139,40 @@ <h2>General Vim resources</h2>
   code editting tool.</p>
 </li>
 </ul>
+<h2>Vim Python IDE bundles and resources</h2>
+<p>Once you get comfortable with Vim as an editor, there are several 
+configuration options and plugins you can use to enhance your Python 
+productivity. These are the resources and tutorials to read when you're
+ready to take that step.</p>
+<ul>
+<li>
+<p>The <a href="https://github.com/klen/python-mode">python-mode</a> project is a Vim
+  plugin with syntax highlighting, breakpoints, PEP8 linting, code completion
+  and many other features you'd expect from an integrated development
+  environment.</p>
+</li>
+<li>
+<p><a href="https://github.com/gmarik/Vundle.vim">Vundle</a> comes highly recommended
+  as a plug-in manager for Vim.</p>
+</li>
+<li>
+<p><a href="http://haridas.in/vim-as-your-ide.html">Vim as Your IDE</a> discusses how to
+  set up Vim for greater productivity once you learn the initial Vim language 
+  for using the editor.</p>
+</li>
+<li>
+<p><a href="unlogic.co.uk/2013/02/08/vim-as-a-python-ide/">Vim as a Python IDE</a>
+  goes through the steps necessary to make Vim into a more comfortable 
+  environment for Python development.</p>
+</li>
+<li>
+<p><a href="http://stackoverflow.com/questions/9172802/setting-up-vim-for-python">Setting up Vim for Python</a>
+  has a well written answer on Stack Overflow for getting started with Vim.</p>
+</li>
+</ul>
 <h2>Vim installation guides</h2>
+<p>These installation guides will help you get Vim up and running on Mac OS X, 
+Linux and Windows.</p>
 <ul>
 <li>
 <p><a href="http://prioritized.net/blog/upgrading-vim-on-os-x/">Upgrading Vim on OS X</a>
@@ -156,6 +190,9 @@ <h2>Vim installation guides</h2>
 </li>
 </ul>
 <h2>Vimrc resources</h2>
+<p>These are a few resources for learning how to structure a .vimrc file. I
+recommend adding configuration options one at a time to test them 
+individually instead of going whole hog with a Vimrc you are unfamiliar with.</p>
 <ul>
 <li>
 <p><a href="http://dougblack.io/words/a-good-vimrc.html">A Good Vimrc</a> is a fantastic,
@@ -166,6 +203,11 @@ <h2>Vimrc resources</h2>
 <p><a href="https://justin.abrah.ms/vim/vim_and_python.html">Vim and Python</a> shows
   and explains many Python-specific .vimrc options.</p>
 </li>
+<li>
+<p>This 
+  <a href="https://github.com/amix/vimrc/tree/master/vimrcs">repository's folder with Vimrc files</a>
+  has example configurations that are well commented and easy to learn from. </p>
+</li>
 </ul>
 <h2>Vim Plugin resources</h2>
 <ul>
@@ -180,6 +222,10 @@ <h2>Vim Plugin resources</h2>
   usefulness. The comments at the bottom are also interesting as people have
   suggested alternatives to some of the plugins mentioned in the post.</p>
 </li>
+<li>
+<p><a href="https://github.com/powerline/powerline">Powerline</a> is a popular statusline
+  plugin for Vim that works with both Python 2 and 3.</p>
+</li>
 </ul>
 <h3>What do you want to learn about Python development?</h3>
                           <div class="row">