Skip to content

Commit

Permalink
Merge pull request alibaba#310 from zhuzhaoyuan/cleanup-readme-markdown
Browse files Browse the repository at this point in the history
Cleanup readme markdown
  • Loading branch information
yaoweibin committed Aug 25, 2013
2 parents 38cdc46 + f31c8f3 commit dd853d2
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 14 deletions.
2 changes: 2 additions & 0 deletions README
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,15 @@ Features
--------
* All features of nginx-1.2.9 are inherited, i.e., it is 100% compatible with nginx.
* Dynamic module loading support. You don't need to recompile Tengine when adding new modules to it.
* Sends unbuffered upload directly to HTTP and FastCGI backend servers, which saves disk I/Os.
* More load balancing methods, e.g., consistent hashing, and session persistence.
* Input body filter support. It's quite handy to write Web Application Firewalls using this mechanism.
* Dynamic scripting language (Lua) support, which is very efficient and makes it easy to extend core functionalities.
* Logging enhancements. Syslog (local and remote), pipe logging, and log sampling are supported.
* Includes a mechanism to support standalone processes.
* Protects the server in case system load or memory use goes too high.
* Multiple CSS or JavaScript requests can be combined into one request to reduce download time.
* Removes unnecessary white spaces and comments to reduce the size of a page.
* Proactive health checks of upstream servers can be performed.
* The number of worker processes and CPU affinities can be set automatically.
* The limit_req module is enhanced with whitelist support and more conditions are allowed in a single location.
Expand Down
30 changes: 16 additions & 14 deletions README.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -2,27 +2,29 @@
Introduction
============

Tengine is a web server originated by [Taobao](http://en.wikipedia.org/wiki/Taobao), the largest e-commerce website in Asia. It is based on [Nginx](http://nginx.org) HTTP server and has many advanced features. Tengine has been proven very stable and efficient on the top 100 global websites, including [taobao.com](http://www.taobao.com) and [tmall.com](http://www.tmall.com).
Tengine is a web server originated by [Taobao](http://en.wikipedia.org/wiki/Taobao), the largest e-commerce website in Asia. It is based on the [Nginx](http://nginx.org) HTTP server and has many advanced features. Tengine has proven to be very stable and efficient on some of the top 100 websites in the world, including [taobao.com](http://www.taobao.com) and [tmall.com](http://www.tmall.com).

Tengine has been an open source project since December 2011. It is being actively developed by the Tengine team, whose core members are from Taobao, Sogou and other Internet companies. Tengine is a community effort and everyone is encouraged to get involved.
Tengine has been an open source project since December 2011. It is being actively developed by the Tengine team, whose core members are from Taobao, Sogou and other Internet companies. Tengine is a community effort and everyone is encouraged to [get involved](https://github.com/alibaba/tengine).

Features
========

* All features of nginx-1.2.9 are inherited, i.e. it is 100% compatible with nginx.
* All features of nginx-1.2.9 are inherited, i.e., it is 100% compatible with nginx.
* Dynamic module loading support. You don't need to recompile Tengine when adding new modules to it.
* More load balancing methods, e.g. consistent hashing, session persistence.
* Input body filter support. It's quite handy to write Web Application Firewalls by using this mechanism.
* Dynamic scripting language (Lua) support, which is very efficient and easy to extend core functionalities.
* Logging enhancement. Syslog (local and remote), pipe logging and log sampling are supported.
* A mechanism to support standalone processes.
* Protecting server in case system load or memory use goes too high.
* Multiple CSS or JavaScript requests can be combined into one request to reduce downloading time.
* Sends unbuffered upload directly to HTTP and FastCGI backend servers, which saves disk I/Os.
* More load balancing methods, e.g., consistent hashing, and session persistence.
* Input body filter support. It's quite handy to write Web Application Firewalls using this mechanism.
* Dynamic scripting language (Lua) support, which is very efficient and makes it easy to extend core functionalities.
* Logging enhancements. Syslog (local and remote), pipe logging, and log sampling are supported.
* Includes a mechanism to support standalone processes.
* Protects the server in case system load or memory use goes too high.
* Multiple CSS or JavaScript requests can be combined into one request to reduce download time.
* Removes unnecessary white spaces and comments to reduce the size of a page.
* Proactive health checks of upstream servers can be performed.
* The number of worker processes and CPU affinities can be set automatically.
* The limit_req module is enhanced with white list support and more conditions are allowed in a single location.
* Diagnostic information to tell the server where the error happened.
* More user friendly command lines. e.g. showing all compiled-in modules and supported directives.
* The limit_req module is enhanced with whitelist support and more conditions are allowed in a single location.
* Enhanced diagnostic information makes it easier to troubleshoot errors.
* More user-friendly command lines, e.g., showing all compiled-in modules and supported directives.
* Expiration times can be specified for certain MIME types.
* Error pages can be reset to 'default'.
* ...
Expand Down Expand Up @@ -50,7 +52,7 @@ You can access [http://tengine.taobao.org/documentation.html](http://tengine.tao
Mailing lists
=============

Mailing lists are usually good places to ask questions. We highly recommend you subscribe Tengine's mailing lists below:
Mailing lists are usually good places to ask questions. We highly recommend you subscribe to Tengine's mailing lists below:
* [http://code.taobao.org/mailman/listinfo/tengine](http://code.taobao.org/mailman/listinfo/tengine) (English)
* [http://code.taobao.org/mailman/listinfo/tengine-cn](http://code.taobao.org/mailman/listinfo/tengine-cn) (Chinese)

0 comments on commit dd853d2

Please sign in to comment.