From: W. Trevor King <wking@tremily.us>
Date: Tue, 11 Mar 2014 17:55:04 +0000 (-0700)
Subject: Merge branch 'namespaced' of git://tremily.us/swc-sql into assembled
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=838ed1cd2f33a27dfccb2987a693d43864723eae;p=swc-boot-camp.git

Merge branch 'namespaced' of git://tremily.us/swc-sql into assembled

* 'namespaced' of git://tremily.us/swc-sql: (24 commits)
  sql: Add sql namespacing
  *.ipynb: Use absolute URLs to link to the glossary
  index.md: Remove YAML front-matter
  Remove novice/sql namespace
  Reorganizing material to put novice + intermediate at top level
  Preparing material for Version 5 novice release
  Fixing data type error in SQL creation
  Switching to triple-tilde in Markdown code blocks in IPython Notebooks
  Resizing bounding boxes of SVGs (manually, since LibreOffice doesn't do it)
  Adding diagrams to novice SQL lessons
  Notes on what diagrams need to be drawn
  Switching to numbered list for lesson links in index files
  Filling in another 40-odd glossary entries
  Filling in glossary entries
  SQL reference sheet
  Updating SQL notes and guide
  Instructor's guide for Python
  Instructor's guide for SQL
  Updating index files
  Modfiying links to glossary in notebook files
  ...
---

838ed1cd2f33a27dfccb2987a693d43864723eae