Merge branch '2.0-rewrite'

Conflicts:
	data/docs/1
	data/tpl/main
	lib/global.pl

5 files changed, 8 insertions, 7 deletions

diff --git a/data/docs/1 b/data/docs/1
index 7e5d3aae..835d2070 100644
--- a/data/docs/1
+++ b/data/docs/1
@@ -87,7 +87,7 @@
  <i>Linear</i>.
 </p>
 <dl>
- <dt>Linear</d><dd>
+ <dt>Linear</dt><dd>
   A game with a linear plot has a static story; it is not possible to get different paths
   or endings. Many games in this category do not prompt the player with choices and simply
   tell the story as it is. This is, however, not a rule: it is also possible for a game
@@ -146,6 +146,7 @@
  A combination of male and female protagonists is possible, e.g. multiple
  protagonists.
  In cases of sex change or transsexuality, use both.
+</p>
 <dl>
   <dt>Male</dt><dd>
     The protagonist is male.
diff --git a/data/docs/2 b/data/docs/2
index e0c7d619..c6428c55 100644
--- a/data/docs/2
+++ b/data/docs/2
@@ -16,7 +16,7 @@
   The title should be based upon the title of the original release.<br />
   If the title uses the Latin alphabet, use our <a href="/d5.2">capitalisation guidelines</a>.<br />
   Otherwise, <a href="/d5.1">romanise</a> according to our guidelines.
- </dt><dt>Original title</dt><dd>
+ </dd><dt>Original title</dt><dd>
   If the name is officially under a different title (usually because of different
   character sets), put the original title here.
  </dd><dt>Aliases</dt><dd>
diff --git a/data/docs/6 b/data/docs/6
index 69116665..02a40469 100644
--- a/data/docs/6
+++ b/data/docs/6
@@ -14,7 +14,7 @@
  <br />
  For more information see <a href="http://en.wikipedia.org/wiki/Visual_Novel">
  the Wikipedia article on visual novels</a> or the description on
- <a href="http://visual-novels.net/vn/index.php?option=com_content&task=view&id=259&Itemid=47">Visual-Novels.net</a>.
+ <a href="http://visual-novels.net/vn/index.php?option=com_content&amp;task=view&amp;id=259&amp;Itemid=47">Visual-Novels.net</a>.
  To get a general idea of the genre, try one of the free short visual novels from
  <a href="http://at2006.haeleth.net/release.php">al|together 2006</a>.
 </p>
@@ -49,7 +49,7 @@
 
 
 :SUB:How can I help VNDB?
-</p>
+<p>
  There are many ways to contribute to VNDB. First of all you can freely
  edit all information found on this website, so if you find any errors
  just click the "edit" link on the top right of the page. You can also
diff --git a/data/docs/7 b/data/docs/7
index fa6fb2d2..ab9fe945 100644
--- a/data/docs/7
+++ b/data/docs/7
@@ -28,7 +28,7 @@
   Founder of VNDB and still active as the main developer.
  </dd><dt><a href="/u93">applehq</a></dt><dd>
   Moderator for both the discussion board and database entries.
- </dd><dt><a href="/u4" class="retired">hillie</a> <b>[retired]</b><dt><dd>
+ </dd><dt><a href="/u4" class="retired">hillie</a> <b>[retired]</b></dt><dd>
   Responsible for beta testing of the first few versions of the site and
   moderating user submitted content.
  </dd>
diff --git a/data/docs/notfinished b/data/docs/notfinished
index 8fc2669a..8b6b379f 100644
--- a/data/docs/notfinished
+++ b/data/docs/notfinished
@@ -1,4 +1,4 @@
-<span class="warning">
+<div class="warning">
  This page is not yet finished!<br />
  If you are interested in helping us finish it off, please join us on <a href="irc://irc.synirc.net/vndb">IRC</a>.
-</span>
+</div>