properly credit @nickh, update copyright

5 files changed, 29 insertions, 17 deletions

diff --git a/LICENSE b/LICENSE
index 39944301..6c8b493a 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 The MIT License
 
-Copyright (c) Ryan Waldron and Dan Allen
+Copyright (C) 2012-2013 Dan Allen and Ryan Waldron
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/README.adoc b/README.adoc
index 982cd335..4417b17c 100644
--- a/README.adoc
+++ b/README.adoc
@@ -1,4 +1,5 @@
 = Asciidoctor
+:awestruct-layout: base
 :homepage: http://asciidoctor.org
 :asciidoc: http://asciidoc.org
 :sources: http://github.com/asciidoctor/asciidoctor
@@ -24,23 +25,26 @@
 and other formats. It's http://rubygems.org/gems/asciidoctor[published
 as a RubyGem] and is available under the MIT open source license.
 
+ifndef::awestruct[]
 image::https://travis-ci.org/asciidoctor/asciidoctor.png?branch=master[Build Status, link="https://travis-ci.org/asciidoctor/asciidoctor"]
+endif::awestruct[]
 
 Asciidoctor uses a set of built-in ERB templates to render the document
 to HTML 5 or DocBook 4.5. We've matched the rendered output as close as
 possible to the default output of the native Python processor. You can
 override this behavior by providing {tilt}[Tilt]-compatible templates.
-See <<usage,Usage>> for more details.
+See the <<usage>> section for more details.
 
 Asciidoctor currently works (read as 'tested') with Ruby 1.8.7, Ruby
 1.9.3, Ruby 2.0.0, JRuby 1.7.2 and Rubinius 1.2.4 (on Linux, Mac and
 Windows). We expect it will work with other versions of Ruby as well and
 would welcome help in testing it out.
 
-The initial code from which Asciidoctor started emerged from the
-{gitscm-next}[Git SCM site repo]. Refer to commit history of
+The initial code from which Asciidoctor emerged was written by
+http://github.com/nickh[Nick Hengeveld] to process the git man pages for
+the {gitscm-next}[Git project site]. Refer to commit history of
 {seed-contribution}[asciidoc.rb] to view the initial contributions and
-individual contributors.
+contributors.
 
 The source code can now be found in the {sources}[Asciidoctor source
 repository] on GitHub.
@@ -448,14 +452,18 @@ GitHub organization:: {org}
 
 == Authors
 
-*Asciidoctor* was written by Ryan Waldron, Dan Allen and
-{contributors}[other contributors].
+*Asciidoctor* was written by http://github.com/mojavelinux[Dan Allen],
+http://github.com/erebor[Ryan Waldron],
+http://github.com/lightguard[Jason Porter], http://github.com/nickh[Nick
+Hengeveld] and {contributors}[other contributors].
 
 *AsciiDoc* was written by Stuart Rackham and has received contributions
 from many other individuals.
 
 == Copyright
 
-Copyright (C) 2012-2013 Ryan Waldron and Dan Allen. See {license}[LICENSE] for details.
+Copyright (C) 2012-2013 Dan Allen and Ryan Waldron. Free use of this
+software is granted under the terms of the MIT License. See
+{license}[LICENSE] for details.
 
 // vim: tw=72
diff --git a/asciidoctor.gemspec b/asciidoctor.gemspec
index 0c7be99a..ff8aa990 100644
--- a/asciidoctor.gemspec
+++ b/asciidoctor.gemspec
@@ -15,8 +15,8 @@ Gem::Specification.new do |s|
 An open source text processor and publishing toolchain, written entirely in Ruby, for converting AsciiDoc markup into HTML 5, DocBook 4.5 and other formats. 
 EOS
   s.license     = 'MIT'
-  s.authors  = ['Ryan Waldron', 'Dan Allen', 'Jeremy McAnally', 'Jason Porter']
-  s.email    = ['rew@erebor.com', 'dan.j.allen@gmail.com']
+  s.authors  = ['Dan Allen', 'Ryan Waldron', 'Jeremy McAnally', 'Jason Porter', 'Nick Hengeveld']
+  s.email    = ['dan.j.allen@gmail.com', 'rew@erebor.com']
   s.homepage = 'http://asciidoctor.org'
 
   s.require_paths = %w[lib]
diff --git a/man/asciidoctor.1 b/man/asciidoctor.1
index 576ff1f8..a9df77a7 100644
--- a/man/asciidoctor.1
+++ b/man/asciidoctor.1
@@ -2,12 +2,12 @@
 .\"     Title: asciidoctor
 .\"    Author: [see the "AUTHORS" section]
 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 04/25/2013
+.\"      Date: 05/03/2013
 .\"    Manual: \ \&
 .\"    Source: \ \&
 .\"  Language: English
 .\"
-.TH "ASCIIDOCTOR" "1" "04/25/2013" "\ \&" "\ \&"
+.TH "ASCIIDOCTOR" "1" "05/03/2013" "\ \&" "\ \&"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -204,7 +204,7 @@ Failure (syntax or usage error; configuration error; document processing failure
 See the \fBAsciidoctor\fR issue tracker: <\fBhttps://github\&.com/asciidoctor/asciidoctor/issues?state=open\fR>
 .SH "AUTHORS"
 .sp
-\fBAsciidoctor\fR was written by Ryan Waldron, Dan Allen and other contributors\&.
+\fBAsciidoctor\fR was written by Dan Allen, Ryan Waldron, Jason Porter, Nick Hengeveld and other contributors\&.
 .sp
 \fBAsciiDoc\fR was written by Stuart Rackham and has received contributions from many other individuals\&.
 .SH "RESOURCES"
@@ -218,4 +218,4 @@ GitHub organization: <\fBhttp://github\&.com/asciidoctor\fR>
 Mailinglist / forum: <\fBhttp://discuss\&.asciidoctor\&.org\fR>
 .SH "COPYING"
 .sp
-Copyright (C) Ryan Waldron and Dan Allen\&. Free use of this software is granted under the terms of the MIT License\&.
+Copyright (C) 2012\-2013 Dan Allen and Ryan Waldron\&. Free use of this software is granted under the terms of the MIT License\&.
diff --git a/man/asciidoctor.ad b/man/asciidoctor.ad
index 0b249185..3cc7fed5 100644
--- a/man/asciidoctor.ad
+++ b/man/asciidoctor.ad
@@ -1,6 +1,7 @@
 asciidoctor(1)
 ==============
 :doctype: manpage
+:awestruct-layout: base
 
 
 NAME
@@ -141,7 +142,8 @@ See the *Asciidoctor* issue tracker: <**https://github.com/asciidoctor/asciidoct
 
 AUTHORS
 -------
-*Asciidoctor* was written by Ryan Waldron, Dan Allen and other contributors.
+*Asciidoctor* was written by Dan Allen, Ryan Waldron, Jason Porter, Nick
+Hengeveld and other contributors.
 
 *AsciiDoc* was written by Stuart Rackham and has received contributions from
 many other individuals.
@@ -160,5 +162,7 @@ Mailinglist / forum: <**http://discuss.asciidoctor.org**>
 
 COPYING
 -------
-Copyright \(C) Ryan Waldron and Dan Allen. Free use of this software is granted
-under the terms of the MIT License.
+Copyright \(C) 2012-2013 Dan Allen and Ryan Waldron. Free use of this
+software is granted under the terms of the MIT License.
+
+// vim: tw=72