vulpineawoo
/
solanum
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Mailmap and copyright update for Ariadne

This commit is contained in:
Ariadne Conill 2021-06-01 11:40:02 -05:00 committed by GitHub
parent 6adc24e5b1
commit 3fc0499e77
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
48 changed files with 51 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.mailmap
View File

@ -1,5 +1,8 @@
Aaron Sethman <androsyn@ratbox.org> androsyn <devnull@localhost>
Alexander Færøy <ahf@0x90.dk> Alexander F?r?y <ahf@0x90.dk>
Ariadne Conill <ariadne@dereferenced.org> <nenolod@atheme.org>
Ariadne Conill <ariadne@dereferenced.org> <nenolod@dereferenced.org>
Ariadne Conill <ariadne@dereferenced.org> nenolod <devnull@localhost>
Brett Greenham <taros@shadowircd.net> B.Greenham <taros@shadowircd.net>
Chris Mills <chris@chrisam.net> TheChrisAM <chris@chrisam.net>
Chris Mills <chris@chrisam.net> freenode!ChrisAM <chris@chrisam.net>
@ -15,7 +18,5 @@ Valeriy Yatsko <dwr@shadowircd.net> <darkwire@darkwire.ru>
Valeriy Yatsko <dwr@shadowircd.net> <darkwire@ircd-charybdis.ru>
Valeriy Yatsko <dwr@shadowircd.net> <darkwire@sellcenter.ru>
Valeriy Yatsko <dwr@shadowircd.net> <dwr@it-penza.org>
William Pitcock <nenolod@dereferenced.org> <nenolod@atheme.org>
William Pitcock <nenolod@dereferenced.org> nenolod <devnull@localhost>
Christine Dodrill <shadow.h511@gmail.com> <quora@lavabit.com>
Christine Dodrill <shadow.h511@gmail.com> <quorawings@gmail.com>

2
CREDITS
View File

@ -10,10 +10,10 @@ tomaw, Tom Wesley <tom@tomaw.net>
The Charybdis team was:
amdj, Aaron Jones <aaronmdjones -at- gmail.com>
Ariadne, Ariadne Conill <ariadne -at- dereferenced.org>
Elizafox, Elizabeth Myers <elizabeth -at- interlinked.me>
jdhore, JD Horelick <jdhore1 -at- gmail.com>
jilles, Jilles Tjoelker <jilles -at- stack.nl>
kaniini, William Pitcock <nenolod -at- dereferenced.org>
mr_flea, Keith Buck <mr_flea -at- esper.net>
viatsko, Valerii Iatsko <dwr -at- codingbox.io>

2
authd/authd.c
View File

@ -1,5 +1,5 @@
/* authd/authd.c - main code for authd
* Copyright (c) 2016 William Pitcock <nenolod@dereferenced.org>
* Copyright (c) 2016 Ariadne Conill <ariadne@dereferenced.org>
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above

2
authd/authd.h
View File

@ -1,5 +1,5 @@
/* authd/dns.h - header for authd DNS functions
* Copyright (c) 2016 William Pitcock <nenolod@dereferenced.org>
* Copyright (c) 2016 Ariadne Conill <ariadne@dereferenced.org>
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above

2
authd/dns.c
View File

@ -1,5 +1,5 @@
/* authd/dns.c - authd DNS functions
* Copyright (c) 2016 William Pitcock <nenolod@dereferenced.org>
* Copyright (c) 2016 Ariadne Conill <ariadne@dereferenced.org>
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above

2
authd/dns.h
View File

@ -1,5 +1,5 @@
/* authd/dns.h - header for authd DNS functions
* Copyright (c) 2016 William Pitcock <nenolod@dereferenced.org>
* Copyright (c) 2016 Ariadne Conill <ariadne@dereferenced.org>
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above

4
doc/credits-past.txt
View File

@ -174,6 +174,7 @@ recent releases of Hybrid, in nick alphabetical order:
A1kmm, Andrew Miller <a1kmm@mware.virtualave.net>
AndroSyn, Aaron Sethman <androsyn@ratbox.org>
Ariadne, Ariadne Conill <ariadne@dereferenced.org>
bane, Dragan Dosen <bane@idolnet.org>
bysin, Ben Kittridge <bkittridge@cfl.rr.com>
cosine, Patrick Alken <wnder@uwns.underworld.net>
@ -187,7 +188,6 @@ jv, Jakub Vlasek <jv@pilsedu.cz>
k9, Jeremy Chadwick <ircd@jdc.parodius.com>
kre, Dinko Korunic <kreator@fly.srk.fer.hr>
madmax, Paul Lomax <madmax@efnet.org>
nenolod, William Pitcock <nenolod@nenolod.net>
Riedel, Dennis Vink, <riedel@chaotic.nl>
scuzzy, David Todd <scuzzy@aniverse.net>
spookey, David Colburn <spookey@spookey.org>
@ -239,9 +239,9 @@ network configurations.
The Charybdis core team, listed in nick-alphabetical order:
amdj, Aaron Jones <aaronmdjones -at- gmail.com>
Ariadne, Ariadne Conill <ariadne -at- dereferenced.org>
Elizafox, Elizabeth Myers <elizabeth -at- interlinked.me>
jilles, Jilles Tjoelker <jilles -at- stack.nl>
kaniini, William Pitcock <nenolod -at- dereferenced.org>
mr_flea, Keith Buck <mr_flea -at- esper.net>
The following people are also project members, listed in nick-alphabetical

2
doc/features/account-notify.txt
View File

@ -1,7 +1,7 @@
account-notify client capability specification
----------------------------------------------
Copyright (c) 2010 William Pitcock <nenolod@atheme.org>.
Copyright (c) 2010 Ariadne Conill <ariadne@dereferenced.org>.
Unlimited redistribution and modification of this document is allowed
provided that the above copyright notice and this permission notice

2
doc/technical/capab.txt
View File

@ -1,5 +1,5 @@
Server capabilities
William Pitcock <nenolod -at- nenolod.net>
Ariadne Conill <ariadne -at- dereferenced.org>
-------------------
Not all TSora IRCd's support these.

2
extensions/chm_nonotice.c
View File

@ -2,7 +2,7 @@
* Solanum: a slightly advanced ircd
* chm_nonotice: block NOTICEs (+T mode).
*
* Copyright (c) 2012 William Pitcock <nenolod@dereferenced.org>
* Copyright (c) 2012 Ariadne Conill <ariadne@dereferenced.org>
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above

2
include/authproc.h
View File

@ -5,7 +5,7 @@
* Copyright (C) 1990 Jarkko Oikarinen and University of Oulu, Co Center
* Copyright (C) 1996-2002 Hybrid Development Team
* Copyright (C) 2002-2012 ircd-ratbox development team
* Copyright (C) 2016 William Pitcock <nenolod@dereferenced.org>
* Copyright (C) 2016 Ariadne Conill <ariadne@dereferenced.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by

2
include/capability.h
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2012 William Pitcock <nenolod@dereferenced.org>.
* Copyright (c) 2012 Ariadne Conill <ariadne@dereferenced.org>.
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above

2
include/client.h
View File

@ -5,7 +5,7 @@
* Copyright (C) 1990 Jarkko Oikarinen and University of Oulu, Co Center
* Copyright (C) 1996-2002 Hybrid Development Team
* Copyright (C) 2002-2004 ircd-ratbox development team
* Copyright (C) 2005 William Pitcock and Jilles Tjoelker
* Copyright (C) 2005 Ariadne Conill and Jilles Tjoelker
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by

2
include/dns.h
View File

@ -5,7 +5,7 @@
* Copyright (C) 1990 Jarkko Oikarinen and University of Oulu, Co Center
* Copyright (C) 1996-2002 Hybrid Development Team
* Copyright (C) 2002-2012 ircd-ratbox development team
* Copyright (C) 2016 William Pitcock <nenolod@dereferenced.org>
* Copyright (C) 2016 Ariadne Conill <ariadne@dereferenced.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by

2
include/ircd_linker.h
View File

@ -2,7 +2,7 @@
* Solanum: a slightly advanced ircd
* ircd_linker.h: IRCd symbol table linking and maintainance
*
* Copyright (c) 2006 William Pitcock <nenolod@nenolod.net>
* Copyright (c) 2006 Ariadne Conill <ariadne@dereferenced.org>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are

2
include/msgbuf.h
View File

@ -1,6 +1,6 @@
/*
* solanum - an advanced ircd.
* Copyright (c) 2016 William Pitcock <nenolod@dereferenced.org>.
* Copyright (c) 2016 Ariadne Conill <ariadne@dereferenced.org>.
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above

2
include/privilege.h
View File

@ -19,7 +19,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
* USA
*
* Copyright (c) 2008 William Pitcock <nenolod@dereferenced.org>
* Copyright (c) 2008 Ariadne Conill <ariadne@dereferenced.org>
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above

2
include/snomask.h
View File

@ -2,7 +2,7 @@
* Solanum: a slightly advanced ircd
* snomask.h: Management for user server-notice masks.
*
* Copyright (c) 2006 William Pitcock <nenolod@nenolod.net>
* Copyright (c) 2006 Ariadne Conill <ariadne@dereferenced.org>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are

2
include/substitution.h
View File

@ -2,7 +2,7 @@
* Solanum: a slightly advanced ircd
* markup.h: parses markup into human-readable strings
*
* Copyright (c) 2006-2007 William Pitcock <nenolod@nenolod.net>
* Copyright (c) 2006-2007 Ariadne Conill <ariadne@dereferenced.org>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are

2
include/wsproc.h
View File

@ -2,7 +2,7 @@
* wsproc.h: An interface to the solanum websocket helper daemon
* Copyright (C) 2007 Aaron Sethman <androsyn@ratbox.org>
* Copyright (C) 2007 ircd-ratbox development team
* Copyright (C) 2016 William Pitcock <nenolod@dereferenced.org>
* Copyright (C) 2016 Ariadne Conill <ariadne@dereferenced.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by

2
ircd/authproc.c
View File

@ -4,7 +4,7 @@
*
* Copyright (C) 2005 Aaron Sethman <androsyn@ratbox.org>
* Copyright (C) 2005-2012 ircd-ratbox development team
* Copyright (C) 2016 William Pitcock <nenolod@dereferenced.org>
* Copyright (C) 2016 Ariadne Conill <ariadne@dereferenced.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by

2
ircd/capability.c
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2012 William Pitcock <nenolod@dereferenced.org>.
* Copyright (c) 2012 Ariadne Conill <ariadne@dereferenced.org>.
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above

2
ircd/client.c
View File

@ -5,7 +5,7 @@
* Copyright (C) 1990 Jarkko Oikarinen and University of Oulu, Co Center
* Copyright (C) 1996-2002 Hybrid Development Team
* Copyright (C) 2002-2005 ircd-ratbox development team
* Copyright (C) 2007 William Pitcock
* Copyright (C) 2007 Ariadne Conill <ariadne@dereferenced.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by

2
ircd/dns.c
View File

@ -4,7 +4,7 @@
*
* Copyright (C) 2005 Aaron Sethman <androsyn@ratbox.org>
* Copyright (C) 2005-2012 ircd-ratbox development team
* Copyright (C) 2016 William Pitcock <nenolod@dereferenced.org>
* Copyright (C) 2016 Ariadne Conill <ariadne@dereferenced.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by

2
ircd/logger.c
View File

@ -3,7 +3,7 @@
*
* Copyright (C) 2003 Lee H <lee@leeh.co.uk>
* Copyright (C) 2003-2005 ircd-ratbox development team
* Copyright (C) 2008 William Pitcock <nenolod@sacredspiral.co.uk>
* Copyright (C) 2008 Ariadne Conill <ariadne@dereferenced.org>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are

2
ircd/msgbuf.c
View File

@ -1,6 +1,6 @@
/*
* solanum - an advanced ircd.
* Copyright (c) 2016 William Pitcock <nenolod@dereferenced.org>.
* Copyright (c) 2016 Ariadne Conill <ariadne@dereferenced.org>.
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above

2
ircd/operhash.c
View File

@ -3,7 +3,7 @@
*
* Copyright (C) 2005 Lee Hardy <lee -at- leeh.co.uk>
* Copyright (C) 2005-2016 ircd-ratbox development team
* Copyright (C) 2016 William Pitcock <nenolod@dereferenced.org>
* Copyright (C) 2016 Ariadne Conill <ariadne@dereferenced.org>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are

2
ircd/parse.c
View File

@ -5,7 +5,7 @@
* Copyright (C) 1990 Jarkko Oikarinen and University of Oulu, Co Center
* Copyright (C) 1996-2002 Hybrid Development Team
* Copyright (C) 2002-2005 ircd-ratbox development team
* Copyright (C) 2007-2016 William Pitcock
* Copyright (C) 2007-2016 Ariadne Conill <ariadne@dereferenced.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by

2
ircd/privilege.c
View File

@ -19,7 +19,7 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
* USA
*
* Copyright (c) 2008 William Pitcock <nenolod@dereferenced.org>
* Copyright (c) 2008 Ariadne Conill <ariadne@dereferenced.org>
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above

2
ircd/snomask.c
View File

@ -2,7 +2,7 @@
* Solanum: a slightly advanced ircd
* snomask.c: Management for user server-notice masks.
*
* Copyright (c) 2006 William Pitcock <nenolod@nenolod.net>
* Copyright (c) 2006 Ariadne Conill <ariadne@dereferenced.org>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are

2
ircd/substitution.c
View File

@ -2,7 +2,7 @@
* Solanum: a slightly advanced ircd
* substitution.c: parses substitution-keyword expansions
*
* Copyright (c) 2006-2007 William Pitcock <nenolod@nenolod.net>
* Copyright (c) 2006-2007 Ariadne Conill <ariadne@dereferenced.org>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are

2
ircd/whowas.c
View File

@ -5,7 +5,7 @@
* Copyright (C) 1990 Jarkko Oikarinen and University of Oulu, Co Center
* Copyright (C) 1996-2002 Hybrid Development Team
* Copyright (C) 2002-2012 ircd-ratbox development team
* Copyright (C) 2016 William Pitcock <nenolod@dereferenced.org>
* Copyright (C) 2016 Ariadne Conill <ariadne@dereferenced.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by

2
librb/include/rb_dictionary.h
View File

@ -2,7 +2,7 @@
* Solanum: a slightly advanced ircd
* rb_dictionary.h: Dictionary-based storage.
*
* Copyright (c) 2007 William Pitcock <nenolod -at- sacredspiral.co.uk>
* Copyright (c) 2007 Ariadne Conill <ariadne -at- dereferenced.org>
* Copyright (c) 2007 Jilles Tjoelker <jilles -at- stack.nl>
*
* Permission to use, copy, modify, and/or distribute this software for any

2
librb/include/rb_radixtree.h
View File

@ -2,7 +2,7 @@
* Solanum: a slightly advanced ircd
* rb_radixtree.h: Dictionary-based storage.
*
* Copyright (c) 2007-2016 William Pitcock <nenolod -at- dereferenced.org>
* Copyright (c) 2007-2016 Ariadne Conill <ariadne -at- dereferenced.org>
* Copyright (c) 2007-2016 Jilles Tjoelker <jilles -at- stack.nl>
*
* Redistribution and use in source and binary forms, with or without

2
librb/src/dictionary.c
View File

@ -2,7 +2,7 @@
* Solanum: a slightly advanced ircd
* rb_dictionary.c: Dictionary-based information storage.
*
* Copyright (c) 2007 William Pitcock <nenolod -at- sacredspiral.co.uk>
* Copyright (c) 2007 Ariadne Conill <ariadne -at- dereferenced.org>
* Copyright (c) 2007 Jilles Tjoelker <jilles -at- stack.nl>
*
* Permission to use, copy, modify, and/or distribute this software for any

2
librb/src/mbedtls.c
View File

@ -4,7 +4,7 @@
*
* Copyright (C) 2007-2008 ircd-ratbox development team
* Copyright (C) 2007-2008 Aaron Sethman <androsyn@ratbox.org>
* Copyright (C) 2015 William Pitcock <nenolod@dereferenced.org>
* Copyright (C) 2015 Ariadne Conill <ariadne@dereferenced.org>
* Copyright (C) 2016 Aaron Jones <aaronmdjones@gmail.com>
*
* This program is free software; you can redistribute it and/or modify

2
librb/src/radixtree.c
View File

@ -2,7 +2,7 @@
* Solanum: a slightly advanced ircd
* rb_radixtree.c: Dictionary-based information storage.
*
* Copyright (c) 2007-2016 William Pitcock <nenolod -at- dereferenced.org>
* Copyright (c) 2007-2016 Ariadne Conill <ariadne -at- dereferenced.org>
* Copyright (c) 2007-2016 Jilles Tjoelker <jilles -at- stack.nl>
*
* Redistribution and use in source and binary forms, with or without

2
modules/cap_account_tag.c
View File

@ -2,7 +2,7 @@
* Solanum: a slightly advanced ircd
* cap_account_tag.c: implement the account-tag IRCv3.2 capability
*
* Copyright (c) 2016 William Pitcock <nenolod@dereferenced.org>
* Copyright (c) 2016 Ariadne Conill <ariadne@dereferenced.org>
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above

2
modules/cap_server_time.c
View File

@ -2,7 +2,7 @@
* Solanum: a slightly advanced ircd
* cap_server_time.c: implement the server-time IRCv3.2 capability
*
* Copyright (c) 2016 William Pitcock <nenolod@dereferenced.org>
* Copyright (c) 2016 Ariadne Conill <ariadne@dereferenced.org>
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above

2
modules/chm_nocolour.c
View File

@ -2,7 +2,7 @@
* Solanum: a slightly advanced ircd
* chm_nocolour: strip colours (+c mode).
*
* Copyright (c) 2012 William Pitcock <nenolod@dereferenced.org>
* Copyright (c) 2012 Ariadne Conill <ariadne@dereferenced.org>
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above

2
modules/chm_noctcp.c
View File

@ -2,7 +2,7 @@
* Solanum: a slightly advanced ircd
* chm_noctcp: block non-action CTCP (+C mode).
*
* Copyright (c) 2012 William Pitcock <nenolod@dereferenced.org>
* Copyright (c) 2012 Ariadne Conill <ariadne@dereferenced.org>
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above

2
modules/m_cap.c
View File

@ -2,7 +2,7 @@
*
* Copyright (C) 2005 Lee Hardy <lee@leeh.co.uk>
* Copyright (C) 2005 ircd-ratbox development team
* Copyright (C) 2016 William Pitcock <nenolod@dereferenced.org>
* Copyright (C) 2016 Ariadne Conill <ariadne@dereferenced.org>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are

2
modules/m_chghost.c
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2005 William Pitcock <nenolod -at- nenolod.net>
* Copyright (c) 2005 Ariadne Conill <ariadne -at- dereferenced.org>
* and Jilles Tjoelker <jilles -at- stack.nl>
* All rights reserved.
*

2
modules/m_list.c
View File

@ -2,7 +2,7 @@
* Solanum: a slightly advanced ircd
* m_list_safelist.c: Version of /list that uses the safelist code.
*
* Copyright (c) 2006 William Pitcock <nenolod@nenolod.net>
* Copyright (c) 2006 Ariadne Conill <ariadne@dereferenced.org>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are

2
modules/m_scan.c
View File

@ -2,7 +2,7 @@
* Solanum: a slightly advanced ircd
* m_scan.c: Provides information about various targets on various topics
*
* Copyright (c) 2006 William Pitcock <nenolod -at- nenolod.net>
* Copyright (c) 2006 Ariadne Conill <ariadne -at- dereferenced.org>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are

2
modules/m_snote.c
View File

@ -2,7 +2,7 @@
* Solanum: a slightly advanced ircd
* m_snote.c: Server notice listener
*
* Copyright (c) 2006 William Pitcock <nenolod -at- nenolod.net>
* Copyright (c) 2006 Ariadne Conill <ariadne@dereferenced.org>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are

2
modules/m_starttls.c
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2012 William Pitcock <nenolod@dereferenced.org>.
* Copyright (c) 2012 Ariadne Conill <ariadne@dereferenced.org>.
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above

2
wsockd/wsockd.c
View File

@ -2,7 +2,7 @@
* wsockd.c: solanum websockets helper
* Copyright (C) 2007 Aaron Sethman <androsyn@ratbox.org>
* Copyright (C) 2007 ircd-ratbox development team
* Copyright (C) 2016 William Pitcock <nenolod@dereferenced.org>
* Copyright (C) 2016 Ariadne Conill <ariadne@dereferenced.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by