diff options
| author | Maxim Dounin <mdounin@mdounin.ru> | 2012-02-05 20:02:59 +0000 |
|---|---|---|
| committer | Maxim Dounin <mdounin@mdounin.ru> | 2012-02-05 20:02:59 +0000 |
| commit | a22bc749c7b170ec8883ef614dd8dd88fca53aaa (patch) | |
| tree | c6f8db5aa27b9baf14d4ae99ad1683c53c178d39 /docs | |
| parent | 915bc544030472d2516a50d317afd82bccb022e1 (diff) | |
| download | nginx-a22bc749c7b170ec8883ef614dd8dd88fca53aaa.tar.gz nginx-a22bc749c7b170ec8883ef614dd8dd88fca53aaa.tar.bz2 | |
Merge of r4406, r4413: copyrights updated.
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/man/nginx.8 | 1 | ||||
| -rw-r--r-- | docs/text/LICENSE | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/docs/man/nginx.8 b/docs/man/nginx.8 index aba20c1a3..587fb457f 100644 --- a/docs/man/nginx.8 +++ b/docs/man/nginx.8 @@ -1,5 +1,6 @@ .\" .\" Copyright (c) 2010 Sergey A. Osokin +.\" Copyright (c) 2011,2012 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 bf31fba7a..1bfc054da 100644 --- a/docs/text/LICENSE +++ b/docs/text/LICENSE @@ -1,5 +1,6 @@ /* - * Copyright (C) 2002-2011 Igor Sysoev + * Copyright (C) 2002-2012 Igor Sysoev + * Copyright (C) 2011,2012 Nginx, Inc. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions |