From 13634ee714a159265adcd99e3c8d00d2d89c2752 Mon Sep 17 00:00:00 2001
From: Amirali Sanatinia <amiralis@users.noreply.github.com>
Date: Fri, 7 Nov 2014 00:27:09 -0500
Subject: [PATCH] Merge Ununtu and Debian

---
 docs/shipping/packaging.rst | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/docs/shipping/packaging.rst b/docs/shipping/packaging.rst
index d9c91b3..8fe7e6b 100644
--- a/docs/shipping/packaging.rst
+++ b/docs/shipping/packaging.rst
@@ -104,9 +104,8 @@ One simple option for a personal PyPi server is to use Amazon S3. A prerequisite
 For Linux Distributions
 ::::::::::::::::::::::::
 
-* `Ubuntu <http://packaging.ubuntu.com/html/python-packaging.html>`_
 * `Fedora <https://fedoraproject.org/wiki/Packaging:Python>`_
-* `Debian <http://www.debian.org/doc/packaging-manuals/python-policy/>`_
+* `Debian and Ubuntu <http://www.debian.org/doc/packaging-manuals/python-policy/>`_
 * `Arch <https://wiki.archlinux.org/index.php/Python_Package_Guidelines>`_
 
 Useful Tools