Merge branch 'github_2_1' into rel_2_1
authorrsoulliere <robert.soulliere@mohawkcollege.ca>
Thu, 6 Oct 2011 18:19:47 +0000 (14:19 -0400)
committerrsoulliere <robert.soulliere@mohawkcollege.ca>
Thu, 6 Oct 2011 18:19:47 +0000 (14:19 -0400)
Conflicts:
1.6/integration/intro.xml
admin/admin-intro.xml
appendices/about_this_documentation.xml
appendices/bookindex.xml
appendices/glossary.xml
appendices/more_info.xml
appendices/permissions.xml
appendices/schema.xml
development/development_intro.xml
intro/about_evergreen.xml
intro/intro_intro.xml
intro/releasenotes.xml
media/evergreen_logo.gif
opac/opac_intro.xml
reports/report-intro.xml
stafftasks/README
stafftasks/stafftasks_intro.xml

appendices/bookindex.xml [changed mode: 0755->0644]
development/development_intro.xml
reports/README [new file with mode: 0644]
reports/reports_intro.xml [new file with mode: 0644]

old mode 100755 (executable)
new mode 100644 (file)
index 82d9a74..e69de29
@@ -1,5 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>\r
-<index xmlns='http://docbook.org/ns/docbook'>\r
-<title>Index</title>\r
-</index>\r
-\r
index e227c2d..e69de29 100644 (file)
@@ -1,3 +0,0 @@
-<partintro xmlns:xl="http://www.w3.org/1999/xlink" xml:id="development_intro">\r
-<para>This part will allow you to customize the Evergreen OPAC, develop useful SQL queries and help you learn the skills necessary for developing new Evergreen applications. It is intended for experienced Evergreen administrators and Evergreen developers who wish to customize Evergreen or enhance their knowledge of the database structure and code. Some of these chapters are introductory in nature, but others assume some level of web development, programming, or database administration experience.</para>\r
-</partintro>\r
diff --git a/reports/README b/reports/README
new file mode 100644 (file)
index 0000000..e69de29
diff --git a/reports/reports_intro.xml b/reports/reports_intro.xml
new file mode 100644 (file)
index 0000000..e69de29