Changed AsciiDoc domain to asciidoc.org.

16 files changed, 62 insertions, 62 deletions

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 5b01600..7dfb1c2 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,7 +1,7 @@
 AsciiDoc ChangeLog
 ==================
 
-:website: http://www.methods.co.nz/asciidoc/
+:website: http://asciidoc.org/
 
 
 Version 8.6.8 (2012-07-17)
@@ -1561,7 +1561,7 @@ Version 8.2.7 (2008-07-04)
   reflect these changes.
 - Highlighted source code paragraphs have been implemented -- it's a
   much more convenient way to enter short code examples (see
-  http://www.methods.co.nz/asciidoc/source-highlight-filter.html[the
+  http://asciidoc.org/source-highlight-filter.html[the
   online docs]).
 - The source highlighter and music filter syntax has changed -- they
   now used the ListingBlock syntax customized with 'source' and
@@ -1688,7 +1688,7 @@ Version 8.2.3 (2007-09-12)
 .Additions and changes
 - Added VMiklos's 'permalink' patch for auto-generated section IDs
   (enabled by default by the `sectids` attribute).
-- Added http://www.methods.co.nz/asciidoc/faq.html[FAQ] to website.
+- Added http://asciidoc.org/faq.html[FAQ] to website.
 - Changed format of \{localdate} attribute to ISO 8601 (`%Y-%m-%d`).
 - Added `abc2ly --beams=None` option to make `music2png.py` conform to
   ABC's notion of beams.
@@ -1723,7 +1723,7 @@ Version 8.2.2 (2007-07-22)
 - http://www.maths.nottingham.ac.uk/personal/drw/lm.html[LaTeXMathML]
   capability has been added for users who are more familiar with or
   prefer LaTeX math formulas to the
-  http://www.methods.co.nz/asciidoc/asciimathml.html[ASCIIMathML]
+  http://asciidoc.org/asciimathml.html[ASCIIMathML]
   notation (thanks to Arthur Sakellariou for the patch).
 - The 'source highlight' and 'code' filters now process embedded
   callouts.
@@ -1814,7 +1814,7 @@ Version 8.2.0 (2007-04-04)
   `manpage` if `--format=manpage` else defaults to `article`
   (previously `--doctype` always defaulted to `article`).
 - Added an 'External Resources' section to the
-  http://www.methods.co.nz/asciidoc/index.html[AsciiDoc home page].
+  http://asciidoc.org/index.html[AsciiDoc home page].
 
 .Bug fixes
 
@@ -1830,7 +1830,7 @@ Version 8.1.0 (2006-10-22)
   http://tpl.sourceforge.net/userguide.html[tpl User Guide] for a
   fancier layout. Use the `-a toc -a numbered` command-line options to
   produce a number table of contents.
-- A http://www.methods.co.nz/asciidoc/music-filter.html[music filter]
+- A http://asciidoc.org/music-filter.html[music filter]
   is included in the distribution `./filters/` directory.  It
   translates music in http://lilypond.org/[LilyPond] or
   http://abcnotation.org.uk/[ABC] notation to standard classical
@@ -1990,7 +1990,7 @@ Version 7.1.2 (2006-03-07)
   http://www1.chapman.edu/~jipsen/mathml/asciimath.html[ASCIIMathML]
   has been added. See 'Appendix I: ASCIIMathML Support' in the User
   Guide and the examples at
-  http://www.methods.co.nz/asciidoc/asciimath.html.
+  http://asciidoc.org/asciimath.html.
 - You can now prefix quoted text with inline attributes lists.  You
   can use this to set font size and color (XHTML and HTML outputs).
 - Added `##...##` quoting -- it does nothing -- it's purpose is to
@@ -3122,7 +3122,7 @@ Version 1.1 (2002-12-03)
 Version 1.0 (2002-11-25)
 ------------------------
 First AsciiDoc public release along with AsciiDoc web site
-(http://www.methods.co.nz/asciidoc/) and SourceForge.net project registration
+(http://asciidoc.org/) and SourceForge.net project registration
 (https://sourceforge.net/projects/asciidoc/[]).
 
 // vim: set syntax=asciidoc:
diff --git a/README.txt b/README.txt
index b53c714..f06f8c9 100644
--- a/README.txt
+++ b/README.txt
@@ -12,7 +12,7 @@ official Python website http://www.python.org.
 Obtaining AsciiDoc
 ------------------
 Documentation and installation instructions are on the AsciiDoc
-website http://www.methods.co.nz/asciidoc/
+website http://asciidoc.org/
 
 
 Tools
diff --git a/doc/a2x.1.txt b/doc/a2x.1.txt
index 56cc956..3b8d874 100644
--- a/doc/a2x.1.txt
+++ b/doc/a2x.1.txt
@@ -274,7 +274,7 @@ REQUISITES
 'a2x' uses the following programs:
 
 - *Asciidoc*:
-  http://www.methods.co.nz/asciidoc/
+  http://asciidoc.org/
 - *xsltproc*: (all formats except text):
   http://xmlsoft.org/XSLT/
 - *DocBook XSL Stylesheets* (all formats except text):
@@ -348,7 +348,7 @@ RESOURCES
 ---------
 SourceForge: http://sourceforge.net/projects/asciidoc/
 
-Main web site: http://www.methods.co.nz/asciidoc/
+Main web site: http://asciidoc.org/
 
 
 COPYING
diff --git a/doc/asciidoc.1.txt b/doc/asciidoc.1.txt
index 87a86f3..ca5d41a 100644
--- a/doc/asciidoc.1.txt
+++ b/doc/asciidoc.1.txt
@@ -187,7 +187,7 @@ RESOURCES
 ---------
 SourceForge: <http://sourceforge.net/projects/asciidoc/>
 
-Main web site: <http://www.methods.co.nz/asciidoc/>
+Main web site: <http://asciidoc.org/>
 
 
 COPYING
diff --git a/doc/asciidoc.txt b/doc/asciidoc.txt
index 0ada785..8000b55 100644
--- a/doc/asciidoc.txt
+++ b/doc/asciidoc.txt
@@ -5,7 +5,7 @@ Stuart Rackham <srackham@gmail.com>
 :toc:
 :icons:
 :numbered:
-:website: http://www.methods.co.nz/asciidoc/
+:website: http://asciidoc.org/
 
 AsciiDoc is a text document format for writing notes, documentation,
 articles, books, ebooks, slideshows, web pages, blogs and UNIX man
@@ -4288,7 +4288,7 @@ Attribute entries can be used to make your documents easier to read
 and write, here are some examples:
 
   :1:         http://freshmeat.net/projects/asciidoc/
-  :homepage:  http://methods.co.nz/asciidoc/[AsciiDoc home page]
+  :homepage:  http://asciidoc.org[AsciiDoc home page]
   :new:       image:./images/smallnew.png[]
   :footnote1: footnote:[A meaningless latin term]
 
diff --git a/doc/asciidocapi.txt b/doc/asciidocapi.txt
index bbf69e7..07c7453 100644
--- a/doc/asciidocapi.txt
+++ b/doc/asciidocapi.txt
@@ -30,7 +30,7 @@ installed -- simple, no setuptools to run, no Eggs to install, no
 non-standard library dependencies.
 
 You can find `asciidocapi.py` in the AsciiDoc
-http://www.methods.co.nz/asciidoc/INSTALL.html#X1[distribution
+http://asciidoc.org/INSTALL.html#X1[distribution
 archives] (version 8.4.1 or better).
 
 Once you have `asciidocapi.py` Verify everything is working by running
diff --git a/doc/faq.txt b/doc/faq.txt
index 2e9ac67..0e3cccf 100644
--- a/doc/faq.txt
+++ b/doc/faq.txt
@@ -27,7 +27,7 @@ able to reference these numbers.
 
 This can be achieved by using the DocBook toolchain but numbering the
 paragraphs with AsciiDoc using a custom config file containing the
-following (see http://www.methods.co.nz/asciidoc/userguide.html#X27
+following (see http://asciidoc.org/userguide.html#X27
 for ways to include such a file):
 
 ---------------------------------------------------------------------
@@ -485,7 +485,7 @@ icons and the CSS stylesheet:
 AsciiDoc has a built-in trace mechanism which is controlled by the
 'trace' attribute; there is also the `--verbose` command-line option.
 These features are detailed in
-http://www.methods.co.nz/asciidoc/userguide.html#X82[Appendix G of the
+http://asciidoc.org/userguide.html#X82[Appendix G of the
 User Guide].
 
 
@@ -836,14 +836,14 @@ ambiguity.  Here are some non-standard escape examples:
 |AsciiDoc | Renders
 
 2*|
-\srackham@methods.co.nz
-<\srackham@methods.co.nz>
-\mailto:[\srackham@methods.co.nz]
+\joe.bloggs@example.com
+<\joe.bloggs@example.com>
+\mailto:[\joe.bloggs@example.com]
 
 2*|
-\http://www.foo1.co.nz
-\\http://www.foobar.com[]
-\\http://www.foobar.com[Foobar Limited]
+\http://www.example.com
+\\http://www.example.com[]
+\\http://www.example.com[Foobar Limited]
 
 2*|
 A C\++ Library for C++
@@ -1207,11 +1207,11 @@ rendered as separate links. You also need to <<X1,replace spaces with
 
 For example, the following call won't work:
 
-  mailto:jb@foobar.com,jd@acme.co.nz?subject=New foofoo release[New foofoo release]
+  mailto:jb@example.com,jd@example.com?subject=New foofoo release[New foofoo release]
 
 Use this instead:
 
-  mailto:jb%40foobar.com,jd%40acme.co.nz?subject=New%20foofoo%20release[New foofoo release]
+  mailto:jb%40example.com,jd%40example.com?subject=New%20foofoo%20release[New foofoo release]
 
 
 == How can a replacement have a trailing backslash?
diff --git a/doc/latex-backend.txt b/doc/latex-backend.txt
index 32d87df..b2f0183 100644
--- a/doc/latex-backend.txt
+++ b/doc/latex-backend.txt
@@ -6,7 +6,7 @@ v1.0, June 2006
 == Introduction
 
 
-LaTeX backend is a configuration file for Stuart Rackham's http://www.methods.co.nz/asciidoc/[Asciidoc]. It generates high-level LaTeX markup from Asciidoc documents. LaTeX is a document preparation system for TeX which in turn is a popular typesetting system. It is well known for producing excellently typesetted high quality printouts, especially suited for scientific text.
+LaTeX backend is a configuration file for Stuart Rackham's http://asciidoc.org/[Asciidoc]. It generates high-level LaTeX markup from Asciidoc documents. LaTeX is a document preparation system for TeX which in turn is a popular typesetting system. It is well known for producing excellently typesetted high quality printouts, especially suited for scientific text.
 
 == Tutorial
 Getting a ready-to-print document from an Asciidoc document using the LaTeX backend involves at least two steps:
@@ -130,7 +130,7 @@ Set the input and output document character set encoding. Currently `ISO-8859-1`
 
 The following software is necessary for using the LaTeX backend:
 
-- An up-to-date version of http://www.methods.co.nz/asciidoc/[Asciidoc]
+- An up-to-date version of http://asciidoc.org/[Asciidoc]
 - An up-to-date TeX distribution, e.g.:
   * http://www.miktex.org/[MiKTeX] for Windows
   * http://www.tug.org/tetex/[teTeX] for Linux
diff --git a/doc/latexmathml.txt b/doc/latexmathml.txt
index 344d7cc..a8985a8 100644
--- a/doc/latexmathml.txt
+++ b/doc/latexmathml.txt
@@ -4,11 +4,11 @@ LaTeXMathML Formulae
 http://www.maths.nottingham.ac.uk/personal/drw/lm.html[LaTeXMathML]
 capability has been added to AsciiDoc for users who are more familar
 with or prefer LaTeX math formulas to the
-http://www.methods.co.nz/asciidoc/asciimathml.html[ASCIIMathML]
+http://asciidoc.org/asciimathml.html[ASCIIMathML]
 notation.
 
 'LaTeXMathML' is a derivative of
-http://www.methods.co.nz/asciidoc/asciimathml.html[ASCIIMathML] -- in
+http://asciidoc.org/asciimathml.html[ASCIIMathML] -- in
 terms of usage the only difference it that you use the `latexmath`
 attribute instead of the `asciimath` attribute.
 
diff --git a/doc/publishing-ebooks-with-asciidoc.txt b/doc/publishing-ebooks-with-asciidoc.txt
index 9d4d24c..06a2bde 100644
--- a/doc/publishing-ebooks-with-asciidoc.txt
+++ b/doc/publishing-ebooks-with-asciidoc.txt
@@ -19,10 +19,10 @@ endif::blogpost[]
 
 It's easy to write and publish books in
 http://en.wikipedia.org/wiki/EPUB[EPUB] and PDF formats using
-http://www.methods.co.nz/asciidoc/[AsciiDoc].
+http://asciidoc.org/[AsciiDoc].
 ifdef::blogpost[]
 This article was originally published on the
-http://www.methods.co.nz/asciidoc/publishing-ebooks-with-asciidoc.html[AsciiDoc
+http://asciidoc.org/publishing-ebooks-with-asciidoc.html[AsciiDoc
 website].
 endif::blogpost[]
 
@@ -108,7 +108,7 @@ or directly using the 'asciidoc' command:
 
 [NOTE]
 ======
-The http://www.methods.co.nz/asciidoc/a2x.1.html[a2x toolchain
+The http://asciidoc.org/a2x.1.html[a2x toolchain
 wrapper] uses the following programs (most will be available
 prepackaged for your Linux distribution):
 
@@ -134,7 +134,7 @@ edited it manually (this took around 15 minutes). To generate the
 
   a2x brothers-karamazov.txt
 
-:examples-url: http://www.methods.co.nz/misc/examples/books/
+:examples-url: http://asciidoc.org/examples/books/
 
 [frame="topbot",options="header",caption=""]
 .Brothers Karamazov source files and eBooks
@@ -197,7 +197,7 @@ Alexey Fyodorovitch Karamazov was the third son of Fyodor Pavlovitch
 ---------------------------------------------------------------------
 
 - The book, book part and chapter titles have been edited to conform
-  to http://www.methods.co.nz/asciidoc/userguide.html#X17[AsciiDoc
+  to http://asciidoc.org/userguide.html#X17[AsciiDoc
   title conventions].
 
 - Book part titles must be level zero titles:
@@ -221,7 +221,7 @@ Alexey Fyodorovitch Karamazov was the third son of Fyodor Pavlovitch
   part, chapter and section numbering.
 
 - Setting the AsciiDoc 'plaintext' attribute suppresses most of
-  http://www.methods.co.nz/asciidoc/userguide.html#_text_formatting[AsciiDoc's
+  http://asciidoc.org/userguide.html#_text_formatting[AsciiDoc's
   text formatting] and substitution conventions, this allows large
   amounts of text to be imported with little or no manual editing.
 
@@ -235,7 +235,7 @@ Alexey Fyodorovitch Karamazov was the third son of Fyodor Pavlovitch
     necessitated editing.
   * You can selectively enable and disable the 'plaintext' attribute
     throughout your document using AsciiDoc
-    http://www.methods.co.nz/asciidoc/userguide.html#X18[attribute
+    http://asciidoc.org/userguide.html#X18[attribute
     entries].
 
 
@@ -279,7 +279,7 @@ Zip file] contains the following files:
   The front cover image.
 
 `adventures-of-sherlock-holmes-docinfo.xml`::
-  A http://www.methods.co.nz/asciidoc/userguide.html#X87[docinfo] file
+  A http://asciidoc.org/userguide.html#X87[docinfo] file
   containing DocBook markup for the front cover image and the Project
   Gutenberg frontmatter.  DocBook XSL Stylesheets identifies the book
   cover image by the `role="cover"` attribute in the DocBook
@@ -332,7 +332,7 @@ To Sherlock Holmes she is always THE woman. I have seldom heard
 
 The manual editing of imported plain text involves formatting the
 title and chapter names as
-http://www.methods.co.nz/asciidoc/userguide.html#X17[AsciiDoc titles]
+http://asciidoc.org/userguide.html#X17[AsciiDoc titles]
 (in this example we've used the 'single line' title format). Sherlock
 Holmes only has two title levels:
 
@@ -370,7 +370,7 @@ http://epubzengarden.com/[ePub Zen Garden].
 
 Including embedded fonts
 ------------------------
-See http://www.methods.co.nz/asciidoc/faq.html#X5[this FAQ].
+See http://asciidoc.org/faq.html#X5[this FAQ].
 
 
 Reading EPUB documents
@@ -393,6 +393,6 @@ Non-fiction Books and Manuals
 AsciiDoc supports a rich set of markup conventions and can generate
 reference works and technical manuals complete with tables,
 illustrations, indexes, bibliographies and appendices. All the
-examples on the http:///www.methods.co.nz/asciidoc/[AsciiDoc web site]
+examples on the http:///asciidoc.org/[AsciiDoc web site]
 can be formatted as EPUB eBooks.
 
diff --git a/examples/website/newtables.txt b/examples/website/newtables.txt
index 038fadc..63858c1 100644
--- a/examples/website/newtables.txt
+++ b/examples/website/newtables.txt
@@ -335,10 +335,10 @@ def sub_word(mo):
 .Cell containing lots of example markup elements
 |====================================================================
 |'URLs':
-http://www.methods.co.nz/asciidoc/[The AsciiDoc home page],
-http://www.methods.co.nz/asciidoc/,
-mailto:joe.bloggs@foobar.com[email Joe Bloggs],
-joe.bloggs@foobar.com,
+http://asciidoc.org/[The AsciiDoc home page],
+http://asciidoc.org/,
+mailto:joe.bloggs@example.com[email Joe Bloggs],
+joe.bloggs@example.com,
 callto:joe.bloggs[].
 
 'Link': See <<X1,AsciiDoc source>>.
@@ -358,10 +358,10 @@ double arrow, <= left double arrow.
 ---------------------------------------------------------------------
 |====================================================================
 |'URLs':
-http://www.methods.co.nz/asciidoc/[The AsciiDoc home page],
-http://www.methods.co.nz/asciidoc/,
-mailto:joe.bloggs@foobar.com[email Joe Bloggs],
-joe.bloggs@foobar.com,
+http://asciidoc.org/[The AsciiDoc home page],
+http://asciidoc.org/,
+mailto:joe.bloggs@example.com[email Joe Bloggs],
+joe.bloggs@example.com,
 callto:joe.bloggs[].
 
 'Link': See <<X1,AsciiDoc source>>.
diff --git a/examples/website/version83.txt b/examples/website/version83.txt
index 08562eb..9a1012e 100644
--- a/examples/website/version83.txt
+++ b/examples/website/version83.txt
@@ -2,9 +2,9 @@ AsciiDoc Version 8.3
 ====================
 
 This is significant release, it gets rid of unused cruft, simplifies
-the http://www.methods.co.nz/asciidoc/newlists.html[lists] syntax and
+the http://asciidoc.org/newlists.html[lists] syntax and
 introduces a decent
-http://www.methods.co.nz/asciidoc/newtables.html[tables] syntax.
+http://asciidoc.org/newtables.html[tables] syntax.
 There are a few fairly minor backward compatibility issues, please
 read the link:CHANGELOG.html#X1[compatibility issues] section in the
 CHANGLOG before upgrading.
diff --git a/filters/code/code-filter.py b/filters/code/code-filter.py
index 473fd6e..a0d0e49 100755
--- a/filters/code/code-filter.py
+++ b/filters/code/code-filter.py
@@ -43,7 +43,7 @@ AUTHOR
 
 URLS
     http://sourceforge.net/projects/asciidoc/
-    http://www.methods.co.nz/asciidoc/
+    http://asciidoc.org/
 
 COPYING
     Copyright (C) 2002-2006 Stuart Rackham. Free use of this software is
diff --git a/help.conf b/help.conf
index 5adc923..fadcb9c 100644
--- a/help.conf
+++ b/help.conf
@@ -189,7 +189,7 @@ RESOURCES
 
    SourceForge: [4]http://sourceforge.net/projects/asciidoc/
 
-   Main web site: [5]http://www.methods.co.nz/asciidoc/
+   Main web site: [5]http://asciidoc.org/
 
 COPYING
 
diff --git a/tests/data/testcases.txt b/tests/data/testcases.txt
index af1f71a..522ac4c 100644
--- a/tests/data/testcases.txt
+++ b/tests/data/testcases.txt
@@ -383,14 +383,14 @@ ambiguity.  Here are some non-standard escape examples:
 |AsciiDoc | Renders
 
 2*|
-\srackham@methods.co.nz
-<\srackham@methods.co.nz>
-\mailto:[\srackham@methods.co.nz]
+\joe.bloggs@example.com
+<\joe.bloggs@example.com>
+\mailto:[\joe.bloggs@example.com]
 
 2*|
-\http://www.foo1.co.nz
-\\http://www.foobar.com[]
-\\http://www.foobar.com[Foobar Limited]
+\http://www.example.com
+\\http://www.example.com[]
+\\http://www.example.com[Foobar Limited]
 
 2*|
 A C\++ Library for C++
@@ -699,16 +699,16 @@ adolescens. Sit munere ponderum dignissim et. Minim luptatum et vel
 footnoteref:[F2].
 Qui in magna commodo, est labitur dolorum an. Est ne magna primis
 adolescens. Sit munere ponderum dignissim et. Minim luptatum et vel.
-footnote:[http://www.methods.co.nz/asciidoc/ Qui in magna commodo,
+footnote:[http://asciidoc.org/ Qui in magna commodo,
 est labitur dolorum an. Est ne magna primis adolescens. Sit munere
 ponderum dignissim et. Minim luptatum et vel
 image:images/smallnew.png[]]
 Qui in magna commodo, est labitur dolorum an. Est ne magna primis
 adolescens. Sit munere ponderum dignissim et. Minim luptatum et vel.
-footnote:[http://www.methods.co.nz/asciidoc/]
+footnote:[http://asciidoc.org/]
 Qui in magna commodo, est labitur dolorum an. Est ne magna primis
 adolescens. Sit munere ponderum dignissim et. Minim luptatum et
-vel footnote:[http://www.methods.co.nz/asciidoc/[AsciiDoc website].].
+vel footnote:[http://asciidoc.org/[AsciiDoc website].].
 Qui in magna commodo, est labitur dolorum an. Est ne magna primis
 adolescens. Sit munere ponderum dignissim et. Minim luptatum et
 footnoteref:[F3,A footnote&#44; &#34;with an image&#34;
diff --git a/vim/syntax/asciidoc.vim b/vim/syntax/asciidoc.vim
index a0c53ea..d53d464 100644
--- a/vim/syntax/asciidoc.vim
+++ b/vim/syntax/asciidoc.vim
@@ -2,7 +2,7 @@
 " Language:     AsciiDoc
 " Author:       Stuart Rackham <srackham@gmail.com> (inspired by Felix
 "               Obenhuber's original asciidoc.vim script).
-" URL:          http://www.methods.co.nz/asciidoc/
+" URL:          http://asciidoc.org/
 " Licence:      GPL (http://www.gnu.org)
 " Remarks:      Vim 6 or greater
 " Limitations: