aboutsummaryrefslogtreecommitdiffstats
path: root/docs/source/siteadmin
diff options
context:
space:
mode:
authorChristopher Allan Webber <cwebber@dustycloud.org>2016-02-19 11:51:20 -0800
committerChristopher Allan Webber <cwebber@dustycloud.org>2016-02-19 11:51:20 -0800
commitc9cdb036578b9636821b2dd88b423f1ebf35559a (patch)
treec7ba55752c5892e792e9e5af4f7c68bba7a8e368 /docs/source/siteadmin
parent5c58b69e51bd2bed1b48e260cb10f9e7f86d6097 (diff)
downloadmediagoblin-c9cdb036578b9636821b2dd88b423f1ebf35559a.tar.lz
mediagoblin-c9cdb036578b9636821b2dd88b423f1ebf35559a.tar.xz
mediagoblin-c9cdb036578b9636821b2dd88b423f1ebf35559a.zip
Move Ubuntu -> *buntu because of absurd trademark issues
For more context, see: http://joeyh.name/blog/entry/trademark_nonsense/
Diffstat (limited to 'docs/source/siteadmin')
-rw-r--r--docs/source/siteadmin/deploying.rst4
-rw-r--r--docs/source/siteadmin/plugins.rst2
-rw-r--r--docs/source/siteadmin/production-deployments.rst4
3 files changed, 5 insertions, 5 deletions
diff --git a/docs/source/siteadmin/deploying.rst b/docs/source/siteadmin/deploying.rst
index 8431d316..b4d89e94 100644
--- 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 baca381d..1f82c670 100644
--- 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 add2cd87..e65ac332 100644
--- 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