Merge branch 'HEAD' of git@github.com:rsoulliere/Evergreen-DocBook.git

diff --git a/2.0/stafftasks/cataloging.xml b/2.0/stafftasks/cataloging.xml
index e9c86ab..e2dd928 100644 (file)
--- a/2.0/stafftasks/cataloging.xml
+++ b/2.0/stafftasks/cataloging.xml
@@ -12,7 +12,7 @@ xml:id="cataloging">
     </abstract>
   </info>
 
-  <section xml:id="MARC">
+  <section xml:id="MARC_editor">
     <title>Working with the MARC Editor</title>
 
     <indexterm>

diff --git a/README b/README
index af49259..850b393 100644 (file)
--- a/README
+++ b/README
@@ -1 +1,3 @@
 This is the documentation for the Evergreen Open-ILS project. It is maintained by DIG volunteers. For the published documentation, visit: http://docs.evergreen-ils.org
+
+edited now 
\ No newline at end of file