resolving merge conflict

Signed-off-by: Jane Sandberg <sandbej@linnbenton.edu>

diff --git a/docs/cataloging/cataloging_web_client.txt b/docs/cataloging/cataloging_web_client.txt
new file mode 100644 (file)
index 0000000..5d8b028
--- /dev/null
+++ b/docs/cataloging/cataloging_web_client.txt
@@ -0,0 +1,28 @@
+Cataloging in the Web Client
+----------------------------
+
+Cataloguers should use this part for understanding the cataloguing procedures used in Evergreen.
+
+
+MARC Tag-table Service
+~~~~~~~~~~~~~~~~~~~~~~
+The tag tables for the web staff client MARC editor are
+now stored in the database rather than a separate XML
+tooltips file as used by the XUL MARC editor.  The tag-table
+service, which is part of the web staff client sprint 2
+preview in this release, has the following features:
+
+- specifies whether (sub)fields are optional or mandatory
+- specifies whether (sub)fields are repeatable or not
+- a coded value map can be associated with a subfield to
+  establish a controlled vocabulary for that subfield
+- MARC field and subfield definitions can be overridden
+  by institutions further down in the organizational unit
+  hierarchy.  This allows, for example, a library to specify
+  definitions for local MARC tags.
+- values supplied by the tag-table service are used to
+  populate values in context menus in the web staff client
+  MARC editor.
+
+The initial seed data for the in-database tag table is
+derived from the current tooltips XML file.

diff --git a/docs/root.txt b/docs/root.txt
index 2281193..507fa3f 100644 (file)
--- a/docs/root.txt
+++ b/docs/root.txt
@@ -533,11 +533,15 @@ include::circulation/circulation_patron_records_web_client.txt[]
 
 Cataloging
 ----------
-Cataloguers should use this part for understanding the cataloguing procedures used in Evergreen.
 
+// Push titles down one level.
+:leveloffset: 1
 
+include::cataloging/cataloging_web_client.txt[]
 include::cataloging/copy-buckets_web_client.txt[]
 
+// Return to normal title levels.
+:leveloffset: 0
 
 
 Using the Public Access Catalog