From 767b7b45a6e2960482271ea1af33edc7b61eeee4 Mon Sep 17 00:00:00 2001
From: rivers <rivers@dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b>
Date: Tue, 4 Aug 2009 18:46:55 +0000
Subject: [PATCH] Added TwoTheta docs; fixed a couple of minor problems

git-svn-id: https://subversion.xor.aps.anl.gov/synApps/areaDetector/trunk@9186 dc6c5ff5-0b8b-c028-a01f-ffb33f00fc8b
---
 documentation/MarCCDDoc.html | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/documentation/MarCCDDoc.html b/documentation/MarCCDDoc.html
index 3fad2c3..4cca131 100755
--- a/documentation/MarCCDDoc.html
+++ b/documentation/MarCCDDoc.html
@@ -497,7 +497,7 @@ remote_mode_server_arguments 2222
         <td>
           $(P)$(R)RotationAxis</td>
         <td>
-          ao</td>
+          stringout</td>
       </tr>
       <tr>
         <td>
@@ -516,6 +516,25 @@ remote_mode_server_arguments 2222
         <td>
           ao</td>
       </tr>
+      <tr>
+        <td>
+          marCCD<br />
+          TwoTheta</td>
+        <td>
+          asynOctet</td>
+        <td>
+          r/w</td>
+        <td>
+          Detector two-theta angle (deg); ignored if empty string; requires theta axis
+          definition with display name "TwoTheta" in marccd configuration file (e.g.
+          "<tt>theta_display_name TwoTheta</tt>")</td>
+        <td>
+          MAR_TWO_THETA</td>
+        <td>
+          $(P)$(R)TwoTheta</td>
+        <td>
+          stringout</td>
+      </tr>
       <tr>
         <td>
           marCCD<br />
@@ -555,7 +574,7 @@ remote_mode_server_arguments 2222
           marCCD<br />
           DatasetComments</td>
         <td>
-          waveform</td>
+          asynOctet</td>
         <td>
           r/w</td>
         <td>