diff options
| author | Maxim Dounin <mdounin@mdounin.ru> | 2013-02-11 15:00:43 +0000 |
|---|---|---|
| committer | Maxim Dounin <mdounin@mdounin.ru> | 2013-02-11 15:00:43 +0000 |
| commit | 7ce291435a0930cc6671e58f5abb530ae8255c76 (patch) | |
| tree | d343811966ed725e8d2f5a9a88ac0edd347c6373 | |
| parent | 635dae7cadfdc67f439f7c7cb79a1c7f51285f4e (diff) | |
| download | nginx-7ce291435a0930cc6671e58f5abb530ae8255c76.tar.gz | |
Merge of r5001: year 2013.
| -rw-r--r-- | docs/man/nginx.8 | 4 | ||||
| -rw-r--r-- | docs/text/LICENSE | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/docs/man/nginx.8 b/docs/man/nginx.8 index 8fcb0b0d2..f119a2327 100644 --- a/docs/man/nginx.8 +++ b/docs/man/nginx.8 @@ -1,6 +1,6 @@ .\" -.\" Copyright (c) 2010 Sergey A. Osokin -.\" Copyright (c) 2011,2012 Nginx, Inc. +.\" Copyright (C) 2010 Sergey A. Osokin +.\" Copyright (C) Nginx, Inc. .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without diff --git a/docs/text/LICENSE b/docs/text/LICENSE index c78be7e37..5d8097000 100644 --- a/docs/text/LICENSE +++ b/docs/text/LICENSE @@ -1,6 +1,6 @@ /* - * Copyright (C) 2002-2012 Igor Sysoev - * Copyright (C) 2011,2012 Nginx, Inc. + * Copyright (C) 2002-2013 Igor Sysoev + * Copyright (C) 2011-2013 Nginx, Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without |