Resolve

diff --cc NEWS
index b1cca1f,9d87609..70f5c50
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,8 -1,13 +1,18 @@@
 +--- [IN PROGRESS]
 +
 +yaz-client emits a better message when receiving an unrecognised
 +userInformationField.
 +
+ --- 3.0.48 2009/08/28
+ 
+ The show command offered by the zoomsh command now takes a 3d optional
+ parameter type which is what is passed to ZOOM_record. If the type
+ argument is omitted, "render" is used.
+ 
+ RPN to CQL conv may use USE string attributes (bug #2978).
+ 
+ MarcXchange NS is now info:lc/xmlns/marcxchange-v1 .
+ 
  --- 3.0.47 2009/07/08
  
  Function yaz_xml2query allows a diagnostic element in the PQF XML

diff --cc doc/common
index cc80f24,cc80f24..95d92dd
--- 1/doc/common
--- 2/doc/common
+++ b/doc/common
@@@ -1,1 -1,1 +1,1 @@@
--Subproject commit cc80f24dcf550d033c2fdf29ea35b4e0961f357d
++Subproject commit 95d92dd6e49fe3807fd1d6c664b3883580290103

diff --cc m4
index f560129,f560129..2ceb2c3
--- 1/m4
--- 2/m4
+++ b/m4
@@@ -1,1 -1,1 +1,1 @@@
--Subproject commit f5601296c571639de99e08ad41493c6d5be06a9a
++Subproject commit 2ceb2c3a4b580e09aadcbd1cbbb12e10b60f1337