From: Adam Dickmeiss <adam@indexdata.dk>
Date: Fri, 6 Dec 2013 15:22:07 +0000 (+0100)
Subject: Update doc WRT json render
X-Git-Tag: v5.0.5~6
X-Git-Url: http://sru.miketaylor.org.uk/cgi-bin?a=commitdiff_plain;h=8bcd70cb460d7a11175e82487f498102ead66472;p=yaz-moved-to-github.git

Update doc WRT json render
---

diff --git a/doc/common b/doc/common
index c6e4db9..9aca8e8 160000
--- a/doc/common
+++ b/doc/common
@@ -1 +1 @@
-Subproject commit c6e4db90ce6779ee42fafd38e776176d38c2844b
+Subproject commit 9aca8e865f3239708224e3f190769170fbd83352
diff --git a/doc/yaz-marcdump-man.xml b/doc/yaz-marcdump-man.xml
index 8195b06..1cdd528 100644
--- a/doc/yaz-marcdump-man.xml
+++ b/doc/yaz-marcdump-man.xml
@@ -52,7 +52,7 @@
    It parses each record and supports output in line-format,
    ISO2709,
    <ulink url="&url.marcxml;">MARCXML</ulink>,
-   <ulink url="http://dilettantes.code4lib.org/blog/2010/09/a-proposal-to-serialize-marc-in-json/">MARC-in-JSON</ulink>,
+   <ulink url="&url.marc_in_json;">MARC-in-JSON</ulink>,
    <ulink url="&url.marcxchange;">MarcXchange</ulink>
    as well as Hex output.
   </para>
diff --git a/doc/zoom.xml b/doc/zoom.xml
index 1261c4e..d1ccf8e 100644
--- a/doc/zoom.xml
+++ b/doc/zoom.xml
@@ -964,6 +964,12 @@ ZOOM_options_set_int(opt, name, value)
         <literal>*len</literal>.
        </para></listitem>
      </varlistentry>
+     <varlistentry><term><literal>json</literal></term>
+      <listitem><para>Like xml, but MARC records are converted to
+	<ulink url="&url.marc_in_json;">MARC-in-JSON</ulink>.
+       </para></listitem>
+     </varlistentry>
+
     </variablelist>
    </para>
    <para>