Move Ubuntu -> *buntu because of absurd trademark issues

For more context, see:
  http://joeyh.name/blog/entry/trademark_nonsense/

diff --git a/docs/source/siteadmin/deploying.rst b/docs/source/siteadmin/deploying.rst
index 8431d316afe32cae3a5acbee8398df1851b5163e..b4d89e94ea35820017403bd5cabe0e8c48e30d6d 100644 (file)
--- a/docs/source/siteadmin/deploying.rst
+++ b/docs/source/siteadmin/deploying.rst
@@ -65,7 +65,7 @@ MediaGoblin has the following core dependencies:
 - `virtualenv <http://www.virtualenv.org/>`_
 - `nodejs <https://nodejs.org>`_
 
-On a DEB-based system (e.g Debian, gNewSense, Trisquel, Ubuntu, and
+On a DEB-based system (e.g Debian, gNewSense, Trisquel, *buntu, and
 derivatives) issue the following command::
 
     sudo apt-get install git-core python python-dev python-lxml \
@@ -376,7 +376,7 @@ into a directory that will be included in your ``nginx`` configuration
 (e.g. "``/etc/nginx/sites-enabled`` or ``/etc/nginx/conf.d``) with
 one of the following commands.
 
-On a DEB-based system (e.g Debian, gNewSense, Trisquel, Ubuntu, and
+On a DEB-based system (e.g Debian, gNewSense, Trisquel, *buntu, and
 derivatives) issue the following commands::
 
     sudo ln -s /srv/mediagoblin.example.org/nginx.conf /etc/nginx/sites-enabled/

diff --git a/docs/source/siteadmin/plugins.rst b/docs/source/siteadmin/plugins.rst
index baca381dd8f449acf15b0d049e2d419bf635c5d2..1f82c670238f3f62e5b2a3912a6cb6f3bb5d91e0 100644 (file)
--- a/docs/source/siteadmin/plugins.rst
+++ b/docs/source/siteadmin/plugins.rst
@@ -55,7 +55,7 @@ offer for your media), we would do::
    virtual environment before installing with pip. Otherwise the plugin
    may get installed in a different environment than the one MediaGoblin
    is installed in. Also make sure, you use e.g. pip-2.7 if your default
-   python (and thus pip) is python 3 (e.g. in Ubuntu).
+   python (and thus pip) is python 3 (e.g. in *buntu).
 
 Once you've installed the plugin software, you need to tell
 MediaGoblin that this is a plugin you want MediaGoblin to use. To do

diff --git a/docs/source/siteadmin/production-deployments.rst b/docs/source/siteadmin/production-deployments.rst
index add2cd8711c006c216005becdd9ac606bd57313e..e65ac332707cbebfc11e791f0ba55ec97ed7d4fe 100644 (file)
--- a/docs/source/siteadmin/production-deployments.rst
+++ b/docs/source/siteadmin/production-deployments.rst
@@ -58,7 +58,7 @@ modify it to suit your environment's setup:
 .. code-block:: bash
 
     # Set the WorkingDirectory, Environment and ExecStart values to match your environment.
-    # If using Debian/Ubuntu, mkdir and chown are located in /bin/mkdir and /bin/chown, respectively.
+    # If using Debian/*buntu, mkdir and chown are located in /bin/mkdir and /bin/chown, respectively.
     # If using Fedora/CentOS/Red Hat, mkdir and chown are located in /usr/bin/mkdir and /usr/bin/chown, respectively.
 
     [Unit]
@@ -90,7 +90,7 @@ The second file should be named ``mediagoblin-paster.service``:
 .. code-block:: bash
 
     # Set the WorkingDirectory, Environment and ExecStart values to match your environment.
-    # If using Debian/Ubuntu, mkdir and chown are located in /bin/mkdir and /bin/chown, respectively.
+    # If using Debian/*buntu, mkdir and chown are located in /bin/mkdir and /bin/chown, respectively.
     # If using Fedora/CentOS/Red Hat, mkdir and chown are located in /usr/bin/mkdir and /usr/bin/chown, respectively.
     [Unit]
     Description=Mediagoblin