s/non-commercial/doujin/ and d3 update

2 files changed, 28 insertions, 16 deletions

diff --git a/data/docs/3 b/data/docs/3
index 2732805c..bdc9be1f 100644
--- a/data/docs/3
+++ b/data/docs/3
@@ -1,5 +1,4 @@
 :TITLE:Adding/Editing a Release
-:INC:notfinished
 :INC:index
 
 
@@ -30,6 +29,11 @@
  </dd><dt>Patch</dt><dd>
   Use this checkbox to indicate that the release is a (translation) patch, used to
   patch an other release.
+ </dd><dt>Freeware</dt><dd>
+  Check if this box if the game is downloadable (or otherwise distributed) at no cost.
+ </dd><dt>Doujin</dt><dd>
+  Published by a doujin circle, amateur group or individual, as opposed to a legal
+  entity such as a company.
  </dd><dt>Title (romaji)</dt><dd>
   The name of the release, in the Latin character set (using Romanisation or translation)
  </dd><dt>Original title</dt><dd>
@@ -54,14 +58,6 @@
  </dd><dt>Age rating</dt><dd>
   The minimum age rating for the release. On most releases, this is specified on the
   packaging or on product web pages.
- </dd><dt>Resolution</dt><dd>
-  Primary/native screen resolution of the game.
- </dd><dt>Voiced</dt><dd>
-  Indicates whether this release includes voice acting. <i>Fully voiced</i> indicates
-  that all characters (maybe with the exeption of a few minor characters) are voiced in
-  all scenes. <i>Only ero scenes voiced</i> speaks for itself, and <i>Partially voiced</i>
-  should be used when there is some voice acting, but only for the main characters or only
-  in some scenes.
  </dd><dt>Notes</dt><dd>
   Anything miscellaneous and useful.
   Generally, extras (but not preorder bonuses) and progress information go here.
@@ -69,13 +65,24 @@
 </dl>
 
 
-:SUB:Platforms &amp; Media
+:SUB:Format
+<dl>
+ <dt>Resolution</dt><dd>
+  Primary/native screen resolution of the game.
+ </dd><dt>Voiced</dt><dd>
+  Indicates whether this release includes voice acting. <i>Fully voiced</i> indicates
+  that all characters (maybe with the exeption of a few minor characters) are voiced in
+  all scenes. <i>Only ero scenes voiced</i> speaks for itself, and <i>Partially voiced</i>
+  should be used when there is some voice acting, but only for the main characters or only
+  in some scenes.</dd>
+</dl>
 <p>
+ <b>Platform</b><br />
  The platforms that the product was released for. Does not include emulated platforms
  (e.g. Playstation 2 games on Playstation 3) or WINE. DVD Player refers to games playable
  as a normal DVD Video (DVDPG) and should not be confused with the DVD as a medium.
  <br /><br />
- The following media can be selected:
+ <b>Media</b>
 </p>
 <dl>
  <dt>Blu-ray</dt><dd>
@@ -110,9 +117,14 @@
 
 
 :SUB:Producers
-..
+<p>
+ The companies/groups/individuals involved in the creation, development or translation
+ of this release. Does not include distributors.
+</p>
 
 
 :SUB:Visual novel relations
-..
+<p>
+ The visual novels that this release (either partially or fully) covers.
+</p>
 
diff --git a/lib/VNDB/Handler/Releases.pm b/lib/VNDB/Handler/Releases.pm
index 007cf7d3..a217a8f8 100644
--- a/lib/VNDB/Handler/Releases.pm
+++ b/lib/VNDB/Handler/Releases.pm
@@ -42,7 +42,7 @@ sub page {
       [ type      => 'Type',           serialize => sub { $self->{release_types}[$_[0]] } ],
       [ patch     => 'Patch',          serialize => sub { $_[0] ? 'Patch' : 'Not a patch' } ],
       [ freeware  => 'Freeware',       serialize => sub { $_[0] ? 'yes' : 'nope' } ],
-      [ doujin    => 'Non-commercial', serialize => sub { $_[0] ? 'yups' : 'nope' } ],
+      [ doujin    => 'Doujin',         serialize => sub { $_[0] ? 'yups' : 'nope' } ],
       [ title     => 'Title (romaji)', diff => 1 ],
       [ original  => 'Original title', diff => 1 ],
       [ gtin      => 'JAN/UPC/EAN',    serialize => sub { $_[0]||'[none]' } ],
@@ -132,7 +132,7 @@ sub _infotable {
 
    Tr ++$i % 2 ? (class => 'odd') : ();
     td 'Publication';
-    td ''.($r->{freeware} ? 'Freeware' : 'Non-free').', '.($r->{doujin} ? 'non-commercial' : 'commercial');
+    td ''.($r->{freeware} ? 'Freeware' : 'Non-free').', '.($r->{doujin} ? 'doujin' : 'commercial');
    end;
 
    if(@{$r->{platforms}}) {
@@ -358,7 +358,7 @@ sub _form {
       options => [ map [ $_, $self->{release_types}[$_] ], 0..$#{$self->{release_types}} ] ],
     [ check  => short => 'patch',     name => 'This release is a patch to another release.' ],
     [ check  => short => 'freeware',  name => 'Freeware (i.e. available at no cost)' ],
-    [ check  => short => 'doujin',    name => 'Non-commercial (released without the intent of making money. e.g. as a doujin circle)' ],
+    [ check  => short => 'doujin',    name => 'Doujin (self-published / not by a commercial company)' ],
     [ input  => short => 'title',     name => 'Title (romaji)', width => 300 ],
     [ input  => short => 'original',  name => 'Original title', width => 300 ],
     [ static => content => 'The original title of this release, leave blank if it already is in the Latin alphabet.' ],