Merge pull request realpython#98 from mahmoudhossam/master

Kenneth Reitz · Kenneth Reitz · commit 6f878661ff9f · 2012-03-14T15:59:28.000-07:00
Django ORM, Linux packaging, and a license chooser.
diff --git a/docs/scenarios/db.rst b/docs/scenarios/db.rst
@@ -25,4 +25,8 @@ database-agnostic code without SQL.
 Django ORM
 ----------
 
-.. todo:: Explain Django ORM
+The Django ORM is the interface used by `Django <http://www.djangoproject.com>`_ to provide database access.
+
+It's based on the idea of models, an abstraction that makes it easier to manipulate data in Python.
+
+Documentation can be found `here <https://docs.djangoproject.com/en/1.3/#the-model-layer>`_
diff --git a/docs/shipping/packaging.rst b/docs/shipping/packaging.rst
@@ -3,7 +3,7 @@ Packaging Your Code
 
 Packaging your code is important.
 
-.. todo:: Write introduction for "Packaging Your Code"
+You'll need to package your code first before sharing it with other developers.
 
 For Python Developers
 :::::::::::::::::::::
@@ -60,7 +60,10 @@ Chishop
 For Linux Distributions
 ::::::::::::::::::::::::
 
-.. todo:: Fill in "For Linux Distributions" packaging stub
+`Ubuntu <https://wiki.ubuntu.com/PackagingGuide/Python>`_
+`Fedora <https://fedoraproject.org/wiki/Packaging:Python>`_
+`Debian <http://www.debian.org/doc/packaging-manuals/python-policy/>`_
+`Arch <https://wiki.archlinux.org/index.php/Python_Package_Guidelines>`_
 
 Useful Tools
 ------------
diff --git a/docs/writing/license.rst b/docs/writing/license.rst
@@ -3,8 +3,9 @@ Choosing a License
 
 Open source.
 
+There are plenty of `open source licenses <http://opensource.org/licenses/alphabetical>`_ available to choose from.
 
-.. todo:: Fill in License stub
+To help you choose one for your project, there's a `license chooser <http://three.org/openart/license_chooser/>`_, use it.
 
 
 Non-Restrictive
