Skip to content

Commit a429409

Browse files
author
Marius Burkard
committed
Merge branch '6160-update-readme-md' into 'develop'
Resolve "Update readme.md" Closes #6160 See merge request ispconfig/ispconfig3!1481
2 parents 2be5c1c + 9c446e6 commit a429409

File tree

2 files changed

+14
-10
lines changed

2 files changed

+14
-10
lines changed

CONTRIBUTING.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ This document is under development and will be continuously improved.
99
* If you want to report several bugs or request several features, open a separate issue for each one of them.
1010

1111
# Branches
12+
* If you are a new user, please send an email to: dev [at] ispconfig [dot] org to receive rights to fork the project.
1213
* Please create an issue for each contribution you want to make.
1314
* Do not put multiple contributions into a single branch and merge request. Each contribution should have it's own branch.
1415
* Do not use the develop branch in your forked project for your contribution. Create a separate branch for each issue.

README.md

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,46 @@
11
# ISPConfig - Hosting Control Panel
2-
![alt text](https://www.ispconfig.org/wp-content/themes/ispconfig/images/ispconfig_logo.png "") \
2+
![ISPConfig logo](https://www.ispconfig.org/wp-content/themes/ispconfig/images/ispconfig_logo.png "") \
33
Development branch: [![pipeline status](https://git.ispconfig.org/ispconfig/ispconfig3/badges/develop/pipeline.svg)](https://git.ispconfig.org/ispconfig/ispconfig3/commits/develop)
44

55
## Functions
66
- Manage multiple servers from one control panel
77
- Single server, multiserver and mirrored clusters.
8-
- Webserver management (Apache2 and nginx)
8+
- Webserver management
99
- Mailserver management
10-
- DNS server management (BIND and PowerDNS)
10+
- DNS server management
1111
- Virtualization (OpenVZ)
1212
- Administrator, reseller, client and mailuser login
13-
- Open Source software (BSD license)
13+
- Open Source software ([BSD license](LICENSE))
1414

1515
## Supported daemons
16-
- HTTP: Apache2 and nginx
16+
- HTTP: Apache2 and NGINX
1717
- HTTP stats: Webalizer, GoAccess and AWStats
1818
- Let's Encrypt: Acme.sh and certbot
1919
- SMTP: Postfix
2020
- POP3/IMAP: Dovecot
2121
- Spamfilter: Rspamd and Amavis
2222
- FTP: PureFTPD
23-
- DNS: BIND9 and PowerDNS
23+
- DNS: BIND9 and PowerDNS[^1]
2424
- Database: MariaDB and MySQL
2525

26+
[^1]: not actively tested
27+
2628
## Supported operating systems
2729
- Debian 9, 10, and testing
2830
- Ubuntu 16.04 - 20.04
2931
- CentOS 7 and 8
3032

3133
## Auto-install script
32-
You can install ISPConfig with our official autoinstaller: https://git.ispconfig.org/ispconfig/ispconfig-autoinstaller/-/blob/master/README.md
34+
You can install the "Perfect Server" with ISPConfig using [our official autoinstaller](https://www.howtoforge.com/ispconfig-autoinstall-debian-ubuntu/)
3335

3436
## Migration tool
35-
The Migration Tool helps you to import data from other control panels (currently ISPConfig 2 and 3 – 3.2, Plesk 10 – 12.5, Plesk Onyx, CPanel** and Confixx 3). For more information, see https://www.ispconfig.org/add-ons/ispconfig-migration-tool/
37+
The Migration Tool helps you to import data from other control panels (currently ISPConfig 2 and 3 – 3.2, Plesk 10 – 12.5, Plesk Onyx, CPanel[^2] and Confixx 3). For more information, see https://www.ispconfig.org/add-ons/ispconfig-migration-tool/
3638

37-
** The Migration Toolkit contains now beta support for migrating CPanel to ISPConfig.
39+
[^2]: The Migration Toolkit now contains beta support for migrating CPanel to ISPConfig.
3840

3941
## Documentation
4042
You can support ISPConfig development by buying the manual: https://www.ispconfig.org/documentation/
4143

4244
## Contributing
43-
If you like to contribute to the ISPConfig development, please send an email to: dev [at] ispconfig [dot] org.
45+
If you like to contribute to the ISPConfig development, please read the contributing guidelines: [CONTRIBUTING.MD](CONTRIBUTING.md)
46+

0 commit comments

Comments
 (0)