From e1ceb050e19c7574bca146a8da7047ee4ff456b5 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Sun, 10 Jul 2016 05:02:35 -0400
Subject: [PATCH] Merge branch 'stable-3.1'

---
 docs/under_development/DEV_CHROOTED_DEBIAN_5.0.txt |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/under_development/DEV_CHROOTED_DEBIAN_5.0.txt b/docs/under_development/DEV_CHROOTED_DEBIAN_5.0.txt
index 5263042..df220aa 100644
--- a/docs/under_development/DEV_CHROOTED_DEBIAN_5.0.txt
+++ b/docs/under_development/DEV_CHROOTED_DEBIAN_5.0.txt
@@ -44,7 +44,7 @@
 
 chroot /var/www
 
-# Update files in the chroot enviroment and install some packages.
+# Update files in the chroot environment and install some packages.
 # You can ignore warnings about locales, we will fix them in the next step.
 
 apt-get update
@@ -104,7 +104,7 @@
 rm -rf ispconfig3_install
 rm -f ISPConfig-3.0.1.4-beta-2.tar.gz
 
-# Move the ispconfig interface part to the chroot enviroment and create a symlink
+# Move the ispconfig interface part to the chroot environment and create a symlink
 
 mkdir /var/www/usr/local/ispconfig
 chown ispconfig:ispconfig /var/www/usr/local/ispconfig

--
Gitblit v1.9.1