Fixed typos in Debian-related documents.

Author: jwarnier

docs/INSTALL_DEBIAN_5.0_courier_mydns.txt

@@ -1,8 +1,8 @@
+Installation
+-------------
 
------------
-
-# It is recommended to use a clean (fresh) Debian lenny install where you just selected "Standard System" as the package selection during
-# setup. Then follow the steps below to setup your server with ISPConfig 3. In this guide "vi" is used as texteditor, but you ofcourse
+# It is recommended to use a clean (fresh) Debian Lenny install where you just selected "Standard System" at the package selection during
+# setup (tasksel). Then follow the steps below to setup your server with ISPConfig 3. In this guide "vi" is used as text editor, but
 # you can use whatever you prefer. You should be root for doing all of this.
 
 
@@ -14,7 +14,6 @@
 # if not, then we assign a hostname (for example ispconfig):
 
 echo ispconfig.example.com > /etc/hostname
-/etc/init.d/hostname.sh
 
 vi /etc/hosts
 
@@ -27,21 +26,20 @@ vi /etc/hosts
 
 /etc/init.d/hostname.sh
 
-# enable the Debian volaitile repository to get a newer clamav version
+# enable the Debian Volatile repository to get an updated ClamAV version
 
-echo "deb http://volatile.debian.org/debian-volatile lenny/volatile main contrib non-free" >> /etc/apt/sources.list
+echo "deb http://volatile.debian.org/debian-volatile lenny/volatile main contrib non-free" >> /etc/apt/sources.list.d/volatile.list
 apt-get update
 
-
 # Some optional choices
 
 opt0.1) Optionally install SSH-server to get remote shell
 
-apt-get install ssh openssh-server
+apt-get install openssh-server
 
-opt0.2) Optionally if you are not running in virtual machine you can set server clocksync via NTP. Virtual quests get this from the host.
+opt0.2) Optionally, if you are not running inside a virtual machine, you can set server clocksync via NTP. Virtual guests get this from the host.
 
-apt-get install ntp ntpdate
+apt-get -y install ntp ntpdate
 
 opt0.3) Optionally if you want vi editor improvement
 
@@ -81,7 +79,7 @@ to:
 
 /etc/init.d/mysql restart
 
-2) Install Amavisd-new, Spamassassin and Clamav (1 line!):
+2) Install Amavisd-new, Spamassassin and ClamAV (1 line!):
 
 apt-get -y install amavisd-new spamassassin clamav clamav-daemon zoo unzip bzip2 arj nomarch lzop cabextract apt-listchanges libnet-ldap-perl libauthen-sasl-perl clamav-docs daemon libio-string-perl libio-socket-ssl-perl libnet-ident-perl zip libnet-dns-perl sudo
 
@@ -116,22 +114,22 @@ mkpop3dcert
 /etc/init.d/courier-pop-ssl restart 
 
 
-3) Install apache, PHP5, phpmyadmin, better fastCGI, suexec, Pear and mcrypt (1 line!):
+3) Install Apache, PHP5, PhpMyAdmin, better fastCGI, suexec, Pear and mcrypt (1 line!):
 
 apt-get -y install apache2 apache2.2-common apache2-doc apache2-mpm-prefork apache2-utils libexpat1 ssl-cert libapache2-mod-php5 php5 php5-common php5-gd php5-mysql php5-imap phpmyadmin php5-cli php5-cgi libapache2-mod-fcgid apache2-suexec php-pear php-auth php5-mcrypt mcrypt php5-imagick imagemagick libapache2-mod-suphp libopenssl-ruby libapache2-mod-ruby
 
 
-# When phpMyAdmin is asking weather to configure itself automatically, select "Apache2"
+# When phpMyAdmin is asking wether to configure itself automatically, select "Apache2"
 
 # Then run the following to enable the Apache modules suexec, rewrite and ssl:
 
 a2enmod suexec rewrite ssl actions include ruby
 
-# If you want to use webdav then run the following to enable the Apache webdav modules:
+# If you want to use WebDAV then run the following to enable the Apache webdav modules:
 
 a2enmod dav_fs dav auth_digest
 
-# restart apache before continuing
+# restart Apache before continuing
 
 /etc/init.d/apache2 restart
 
@@ -140,7 +138,7 @@ a2enmod dav_fs dav auth_digest
 
 apt-get -y install pure-ftpd-common pure-ftpd-mysql quota quotatool
 
-# Enable TLS in pureftpd
+# Optional: Enable TLS in pureftpd
 echo 1 > /etc/pure-ftpd/conf/TLS
 mkdir -p /etc/ssl/private/
 openssl req -x509 -nodes -newkey rsa:1024 -keyout /etc/ssl/private/pure-ftpd.pem  -out /etc/ssl/private/pure-ftpd.pem
@@ -171,7 +169,7 @@ quotacheck -avugm
 quotaon -avug
 
 
-5) Install mydns
+5) Install MyDNS
 
 apt-get install g++ libc6 gcc gawk make texinfo libmysqlclient15-dev
 
@@ -266,12 +264,12 @@ update-rc.d mydns defaults
 
 6) Install vlogger and webalizer
 
-apt-get install vlogger webalizer
+apt-get -y install vlogger webalizer
 
 
-7) Install Jailkit (optional, only needed if you want to use chrroting for SSH users)
+7) Install Jailkit (optional, only needed if you want to use chrooting for SSH users)
 
-apt-get install build-essential autoconf automake1.9 libtool flex bison debhelper
+apt-get -y install build-essential autoconf automake1.9 libtool flex bison debhelper
 cd /tmp
 wget http://olivier.sessink.nl/jailkit/jailkit-2.11.tar.gz
 tar xvfz jailkit-2.11.tar.gz
@@ -284,7 +282,7 @@ rm -rf jailkit-2.11*
 8) Install fail2ban (optional but recomended, because the monitor tries to show the log)
 More info at: http://www.howtoforge.com/fail2ban_debian_etch
 
-apt-get install fail2ban
+apt-get -y install fail2ban
 
 9) Install ISPConfig 3
 

docs/INSTALL_DEBIAN_5.0_dovecot_bind.txt

@@ -1,8 +1,8 @@
 Installation
------------
+-------------
 
-# It is recommended to use a clean (fresh) Debian lenny install where you just selected "Standard System" as the package selection during
-# setup. Then follow the steps below to setup your server with ISPConfig 3. In this guide "vi" is used as texteditor, but you ofcourse
+# It is recommended to use a clean (fresh) Debian Lenny install where you just selected "Standard System" at the package selection during
+# setup (tasksel). Then follow the steps below to setup your server with ISPConfig 3. In this guide "vi" is used as text editor, but
 # you can use whatever you prefer. You should be root for doing all of this.
 
 
@@ -26,18 +26,18 @@ vi /etc/hosts
 
 /etc/init.d/hostname.sh
 
-# enable the Debian volaitile repository to get a newer clamav version
+# enable the Debian Volatile repository to get an updated ClamAV version
 
-echo "deb http://volatile.debian.org/debian-volatile lenny/volatile main contrib non-free" >> /etc/apt/sources.list
+echo "deb http://volatile.debian.org/debian-volatile lenny/volatile main contrib non-free" >> /etc/apt/sources.list.d/volatile.list
 apt-get update
 
 # Some optional choices
 
 opt0.1) Optionally install SSH-server to get remote shell
 
-apt-get install ssh openssh-server
+apt-get install openssh-server
 
-opt0.2) Optionally if you are not running in virtual machine you can set server clocksync via NTP. Virtual quests get this from the host.
+opt0.2) Optionally, if you are not running inside a virtual machine, you can set server clocksync via NTP. Virtual guests get this from the host.
 
 apt-get -y install ntp ntpdate
 
@@ -79,27 +79,27 @@ to:
 
 /etc/init.d/mysql restart
 
-2) Install Amavisd-new, Spamassassin and Clamav (1 line!):
+2) Install Amavisd-new, Spamassassin and ClamAV (1 line!):
 
 apt-get -y install amavisd-new spamassassin clamav clamav-daemon zoo unzip bzip2 arj nomarch lzop cabextract apt-listchanges libnet-ldap-perl libauthen-sasl-perl clamav-docs daemon libio-string-perl libio-socket-ssl-perl libnet-ident-perl zip libnet-dns-perl
 
 
-3) Install apache, PHP5, phpmyadmin, better fastCGI, suexec, Pear and mcrypt (1 line!):
+3) Install Apache, PHP5, phpmyadmin, better fastCGI, suexec, Pear and mcrypt (1 line!):
 
 apt-get -y install apache2 apache2.2-common apache2-doc apache2-mpm-prefork apache2-utils libexpat1 ssl-cert libapache2-mod-php5 php5 php5-common php5-gd php5-mysql php5-imap phpmyadmin php5-cli php5-cgi libapache2-mod-fcgid apache2-suexec php-pear php-auth php5-mcrypt mcrypt php5-imagick imagemagick libapache2-mod-suphp libopenssl-ruby libapache2-mod-ruby
 
 
-# When phpMyAdmin is asking weather to configure itself automatically, select "Apache2"
+# When phpMyAdmin is asking wether to configure itself automatically, select "Apache2"
 
 # Then run the following to enable the Apache modules suexec, rewrite and ssl:
 
 a2enmod suexec rewrite ssl actions include ruby
 
-# If you want webdav then run the following to enable the Apache webdav modules:
+# If you want to use WebDAV then run the following to enable the Apache webdav modules:
 
-a2enmod dav_fs a2enmod dav auth_digest
+a2enmod dav_fs dav auth_digest
 
-# restart apache before continuing
+# restart Apache before continuing
 
 /etc/init.d/apache2 restart
 
@@ -148,7 +148,7 @@ apt-get -y install bind9 dnsutils
 apt-get -y install vlogger webalizer
 
 
-7) Install Jailkit (optional, only needed if you want to use chrroting for SSH users)
+7) Install Jailkit (optional, only needed if you want to use chrooting for SSH users)
 
 apt-get -y install build-essential autoconf automake1.9 libtool flex bison debhelper
 cd /tmp

docs/INSTALL_DEBIAN_6.0_courier_mydns.txt

@@ -1,8 +1,8 @@
 Installation
------------
+-------------
 
-# It is recommended to use a clean (fresh) Debian Squeeze install where you just selected "Standard System" as the package selection during
-# setup. Then follow the steps below to setup your server with ISPConfig 3. In this guide "vi" is used as texteditor, but you ofcourse
+# It is recommended to use a clean (fresh) Debian Squeeze install where you just selected "Standard System" at the package selection during
+# setup (tasksel). Then follow the steps below to setup your server with ISPConfig 3. In this guide "vi" is used as text editor, but
 # you can use whatever you prefer. You should be root for doing all of this.
 
 
@@ -28,24 +28,22 @@ vi /etc/hosts
 
 opt0.1) Optionally install SSH-server to get remote shell
 
-apt-get install ssh openssh-server
+apt-get install openssh-server
 
-opt0.2) Optionally if you are not running in virtual machine you can set server clocksync via NTP. Virtual quests get this from the host.
+opt0.2) Optionally, if you are not running inside a virtual machine, you can set server clocksync via NTP. Virtual guests get this from the host.
 
-apt-get install ntp ntpdate
+apt-get -y install ntp ntpdate
 
 opt0.3) Optionally if you want vi editor improvement
 
-apt-get install vim-nox
-
+apt-get -y install vim-nox
 
 
 # Next is the real deal
 
 1) Install Postfix, Courier, Saslauthd, MySQL, phpMyAdmin, rkhunter, binutils with the following command line (on one line!):
 
-apt-get install postfix postfix-mysql postfix-doc mysql-client mysql-server courier-authdaemon courier-pop courier-pop-ssl courier-authlib-mysql courier-imap courier-imap-ssl libsasl2-2 libsasl2-modules libsasl2-modules-sql sasl2-bin libpam-mysql openssl courier-maildrop getmail4 rkhunter binutils sudo
-
+apt-get -y install postfix postfix-mysql postfix-doc mysql-client mysql-server courier-authdaemon courier-pop courier-pop-ssl courier-authlib-mysql courier-imap courier-imap-ssl libsasl2-2 libsasl2-modules libsasl2-modules-sql sasl2-bin libpam-mysql openssl courier-maildrop getmail4 rkhunter binutils sudo
 
 # Answer the questions from the package manager as follows.
 
@@ -74,9 +72,9 @@ to:
 
 /etc/init.d/mysql restart
 
-2) Install Amavisd-new, Spamassassin and Clamav (1 line!):
+2) Install Amavisd-new, Spamassassin and ClamAV (1 line!):
 
-apt-get install amavisd-new spamassassin clamav clamav-daemon zoo unzip bzip2 arj nomarch lzop cabextract apt-listchanges libnet-ldap-perl libauthen-sasl-perl clamav-docs daemon libio-string-perl libio-socket-ssl-perl libnet-ident-perl zip libnet-dns-perl
+apt-get -y install amavisd-new spamassassin clamav clamav-daemon zoo unzip bzip2 arj nomarch lzop cabextract apt-listchanges libnet-ldap-perl libauthen-sasl-perl clamav-docs daemon libio-string-perl libio-socket-ssl-perl libnet-ident-perl zip libnet-dns-perl
 #this is necessary? libnet-ldap-perl
 
 # During the installation, the SSL certificates for IMAP-SSL and POP3-SSL are created with the hostname localhost. To change this to the correct hostname (server1.example.com in this tutorial), delete the certificates...
@@ -110,32 +108,32 @@ mkpop3dcert
 /etc/init.d/courier-pop-ssl restart 
 
 
-3) Install apache, PHP5, phpmyadmin, better fastCGI, suexec, Pear and mcrypt (1 line!):
+3) Install Apache, PHP5, PhpMyAdmin, better fastCGI, suexec, Pear and mcrypt (1 line!):
 
-apt-get install apache2 apache2.2-common apache2-doc apache2-mpm-prefork apache2-utils libexpat1 ssl-cert libapache2-mod-php5 php5 php5-common php5-gd php5-mysql php5-imap phpmyadmin php5-cli php5-cgi libapache2-mod-fcgid apache2-suexec php-pear php-auth php5-mcrypt mcrypt imagemagick libapache2-mod-suphp libopenssl-ruby libapache2-mod-ruby
+apt-get -y install apache2 apache2.2-common apache2-doc apache2-mpm-prefork apache2-utils libexpat1 ssl-cert libapache2-mod-php5 php5 php5-common php5-gd php5-mysql php5-imap phpmyadmin php5-cli php5-cgi libapache2-mod-fcgid apache2-suexec php-pear php-auth php5-mcrypt mcrypt imagemagick libapache2-mod-suphp libopenssl-ruby libapache2-mod-ruby
 
 #this package is actual missed on official squeeze repository: php5-imagick
 
-# When phpMyAdmin is asking weather to configure itself automatically, select "Apache2"
+# When phpMyAdmin is asking wether to configure itself automatically, select "Apache2"
 
 # Then run the following to enable the Apache modules suexec, rewrite and ssl:
 
 a2enmod suexec rewrite ssl actions include ruby
 
-# If you want webdav then run the following to enable the Apache webdav modules:
+# If you want to use WebDAV then run the following to enable the Apache webdav modules:
 
-a2enmod dav_fs a2enmod dav auth_digest
+a2enmod dav_fs dav auth_digest
 
-# restart apache before continuing
+# restart Apache before continuing
 
 /etc/init.d/apache2 restart
 
 
 4) Install pure-ftpd and quota
 
-apt-get install pure-ftpd-common pure-ftpd-mysql quota quotatool
+apt-get -y install pure-ftpd-common pure-ftpd-mysql quota quotatool
 
-# Some additional settings for pureftpd
+# Optional: Some additional settings for pureftpd
 
 echo "yes" > /etc/pure-ftpd/conf/DisplayDotFiles
 
@@ -170,7 +168,7 @@ quotacheck -avugm &&
 quotaon -avug
 
 
-5) Install mydns
+5) Install MyDNS
 
 apt-get install g++ libc6 gcc gawk make texinfo libmysqlclient-dev
 
@@ -265,12 +263,12 @@ update-rc.d mydns defaults
 
 6) Install vlogger and webalizer
 
-apt-get install vlogger webalizer
+apt-get -y install vlogger webalizer
 
 
-7) Install Jailkit (optional, only needed if you want to use chrroting for SSH users)
+7) Install Jailkit (optional, only needed if you want to use chrooting for SSH users)
 
-apt-get install build-essential autoconf automake1.9 libtool flex bison debhelper
+apt-get -y install build-essential autoconf automake1.9 libtool flex bison debhelper
 cd /tmp
 wget http://olivier.sessink.nl/jailkit/jailkit-2.11.tar.gz
 tar xvfz jailkit-2.11.tar.gz
@@ -283,7 +281,7 @@ rm -rf jailkit-2.11*
 8) Install fail2ban (optional but recomended, because the monitor tries to show the log)
 More info at: http://www.howtoforge.com/fail2ban_debian_etch
 
-apt-get install fail2ban
+apt-get -y install fail2ban
 
 9) Install ISPConfig 3