Skip to content

Commit d7ef36d

Browse files
author
jwarnier
committed
fix typos
1 parent b97379c commit d7ef36d

File tree

4 files changed

+17
-17
lines changed

4 files changed

+17
-17
lines changed

TODO.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Server
2323
Mail module
2424
--------------------------------------
2525

26-
- Show mail statistics in the interface. the mail statistics are stored
26+
- Show mail statistics in the interface. The mail statistics are stored
2727
in the database table mail_traffic and are collected by the file
2828
server/cron_daily.php
2929

docs/CHROOTED_DEBIAN_5.0.txt

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,38 +5,38 @@
55
# dxr@brutalsec.net
66
# 01-09-2009
77
#
8-
# We can create a script for configure chroot enviroment but,
8+
# We can create a script for configure chroot environment but,
99
# YOU MUST UNDERSTAND HOW TO WORK IT for can solve possible
1010
# problems in the future.
1111
#
12-
# Every service has its own chroot enviroment:
12+
# Every service has its own chroot environment:
1313
# BIND -> chroot
1414
# Apache -> chroot
1515
# Dovecot -> chroot
1616
# Pureftpd -> Apache's chroot
1717
#
1818
# Only apache and php packages aren't installed in real system,
19-
# only in chroot enviroment with symbolic links from real system.
19+
# only in chroot environment with symbolic links from real system.
2020
#
2121
# PLEASE, CONFIGURE CHROOT ENVIROMENT IF SECURITY IS REALLY
2222
# IMPORTANT FOR YOU AND YOU KNOWN HOW TO WORK IT!
2323
#
2424

2525
exit 1
2626

27-
1. BACKUP before change something in the system
27+
1. BACKUP before changing anything on the system
2828
2. Create partitions
29-
3. Remove possible apache or php installations on real system
30-
4. Prepair Chroot enviroment
29+
3. Remove possible Apache or PHP installations on real system
30+
4. Prepare Chroot environment
3131
5. Linking Webserver aplication from real system
3232
6. mini_sendmail
3333
7. Test services
3434
8. Howto install ispconfig3
3535
9. Migration
3636

3737

38-
1. BACKUP before change something in the system
39-
# If is not a new instalation, then
38+
1. BACKUP before changing anything on the system
39+
# If is not a new installation, then
4040

4141
BACKUP BACKUP BACKUP BACKUP BACKUP BACKUP
4242
BACKUP BACKUP BACKUP BACKUP BACKUP BACKUP
@@ -62,12 +62,12 @@ mount /dev/lvm_foobar2/apachelogs_lv /var/www/html/var/log/apache2
6262
mount /dev/lvm_foobar3/hosting_lv /var/www/html/var/www/html
6363

6464

65-
3. Remove possible apache or php installations on real system
66-
# We never wont install apache or php in non-chroot system, if we have installed, we only have do a backup of confgigurations, uninstall, and check every simbolic link
65+
3. Remove possible Apache or PHP installations on real system
66+
# We never wont install apache or php in non-chroot system, if we have installed, we only have do a backup of configurations, uninstall, and check every symbolic link
6767
dpkg -l|egrep --color -i 'apache|php'
6868

6969

70-
4. Prepair Chroot enviroment
70+
4. Prepare Chroot environment
7171

7272
# Install packages in real system
7373
apt-get install debootstrap libpcre3 libaprutil1 libxml2 mime-support patch make gcc mysql-server subversion ssh openssh-server ntp ntpdate vim libdbd-mysql libdbi-perl dnsutils
@@ -128,7 +128,7 @@ chown root:root /var/www/html/etc/apache2/ && chmod 700 /var/www/html/etc/apache
128128
chmod 711 /var/www/html/etc/php5/
129129

130130

131-
5. # Is good idea to add nagios alarm for check every simbolic link is correct.
131+
5. # Is good idea to add Nagios alarm for check every symbolic link is correct.
132132
ln -s /var/www/html/etc/apache2 /etc/apache2
133133
ln -s /var/www/html/etc/suphp /etc/suphp
134134
ln -s /var/www/html/var/run/apache2 /var/run/apache2

docs/under_development/DEV_CHROOTED_DEBIAN_5.0.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ ln -s / www
4444

4545
chroot /var/www
4646

47-
# Update files in the chroot enviroment and install some packages.
47+
# Update files in the chroot environment and install some packages.
4848
# You can ignore warnings about locales, we will fix them in the next step.
4949

5050
apt-get update
@@ -104,7 +104,7 @@ cd /tmp/
104104
rm -rf ispconfig3_install
105105
rm -f ISPConfig-3.0.1.4-beta-2.tar.gz
106106

107-
# Move the ispconfig interface part to the chroot enviroment and create a symlink
107+
# Move the ispconfig interface part to the chroot environment and create a symlink
108108

109109
mkdir /var/www/usr/local/ispconfig
110110
chown ispconfig:ispconfig /var/www/usr/local/ispconfig

interface/lib/classes/tform.inc.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
* - DOUBLE
4141
* - CURRENCY (Formats digits in currency notation)
4242
* - VARCHAR (No format check)
43-
* - DATE (Date format, converts from and to linux timestamps automatically)
43+
* - DATE (Date format, converts from and to UNIX timestamps automatically)
4444
*
4545
* Formtype:
4646
* - TEXT (Normal text field)
@@ -1421,4 +1421,4 @@ function _getDateTimeHTML($form_element, $default_value, $display_seconds=false)
14211421
}
14221422
}
14231423

1424-
?>
1424+
?>

0 commit comments

Comments
 (0)