diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2011-09-29 18:12:11 +0200 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2011-09-29 18:12:11 +0200 |
| commit | 622daf3b96666f8bbabec44a15b26a188a83b95e (patch) | |
| tree | 706377087e70525e9bdc68b2f98911d56b915e5d /erts/doc | |
| parent | 09c46998b3a4b0060b3ff3799c142d564f91f517 (diff) | |
| parent | 5acac472723ef5cac6a944caf7b7ec4320c003e9 (diff) | |
| download | otp-622daf3b96666f8bbabec44a15b26a188a83b95e.tar.gz otp-622daf3b96666f8bbabec44a15b26a188a83b95e.tar.bz2 otp-622daf3b96666f8bbabec44a15b26a188a83b95e.zip | |
Merge branch 'dev' into major
* dev:
Update copyright years
Diffstat (limited to 'erts/doc')
| -rw-r--r-- | erts/doc/src/alt_dist.xml | 2 | ||||
| -rw-r--r-- | erts/doc/src/erlsrv.xml | 2 | ||||
| -rw-r--r-- | erts/doc/src/start_erl.xml | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/erts/doc/src/alt_dist.xml b/erts/doc/src/alt_dist.xml index c30e04fce7..038950b54d 100644 --- a/erts/doc/src/alt_dist.xml +++ b/erts/doc/src/alt_dist.xml @@ -4,7 +4,7 @@ <chapter> <header> <copyright> - <year>2000</year><year>2010</year> + <year>2000</year><year>2011</year> <holder>Ericsson AB. All Rights Reserved.</holder> </copyright> <legalnotice> diff --git a/erts/doc/src/erlsrv.xml b/erts/doc/src/erlsrv.xml index 919caa9542..c1ecbc7b77 100644 --- a/erts/doc/src/erlsrv.xml +++ b/erts/doc/src/erlsrv.xml @@ -4,7 +4,7 @@ <comref> <header> <copyright> - <year>1998</year><year>2010</year> + <year>1998</year><year>2011</year> <holder>Ericsson AB. All Rights Reserved.</holder> </copyright> <legalnotice> diff --git a/erts/doc/src/start_erl.xml b/erts/doc/src/start_erl.xml index 6f6930af7e..92d87b095a 100644 --- a/erts/doc/src/start_erl.xml +++ b/erts/doc/src/start_erl.xml @@ -4,7 +4,7 @@ <comref> <header> <copyright> - <year>1998</year><year>2009</year> + <year>1998</year><year>2011</year> <holder>Ericsson AB. All Rights Reserved.</holder> </copyright> <legalnotice> |