summaryrefslogtreecommitdiff
path: root/README.md
diff options
context:
space:
mode:
authorMatthew Holt <mholt@users.noreply.github.com>2021-09-24 18:31:01 -0600
committerMatthew Holt <mholt@users.noreply.github.com>2021-09-24 18:31:01 -0600
commit501da21f209c9fad92c65c8ba02a969a03ec5379 (patch)
treec60876dc13b4277bb933feea19b4494a26f639ed /README.md
parent3336faf25466b1b2d9a007f5468d05a887e16775 (diff)
General minor improvements to docs
Diffstat (limited to 'README.md')
-rw-r--r--README.md2
1 files changed, 2 insertions, 0 deletions
diff --git a/README.md b/README.md
index 5f00e32..b610d1d 100644
--- a/README.md
+++ b/README.md
@@ -176,6 +176,8 @@ Please use our [issue tracker](https://github.com/caddyserver/caddy/issues) only
## About
+Matthew Holt began developing Caddy in 2014 while studying computer science at Brigham Young University. It soon became the first web server to use HTTPS automatically and by default, and now has hundreds of contributors and has served trillions of HTTPS requests.
+
**The name "Caddy" is trademarked.** The name of the software is "Caddy", not "Caddy Server" or "CaddyServer". Please call it "Caddy" or, if you wish to clarify, "the Caddy web server". Caddy is a registered trademark of Stack Holdings GmbH.
- _Project on Twitter: [@caddyserver](https://twitter.com/caddyserver)_