nomenclature improvements, updating README.txt

Signed-off-by: Joshua Ferraro <jmf@liblime.com>

diff --git a/README.txt b/README.txt
index 018b73d..769abc1 100644 (file)
--- a/README.txt
+++ b/README.txt
@@ -1,26 +1,10 @@
-Koha - award-winning GPL Integrated Library System
-
-Koha aims to be a full-featured Integrated Library System. Developed
-initially in New Zealand by Katipo Communications Ltd and first deployed
-in January of 2000 for Horowhenua Library Trust, it is currently
-maintained by a team of software providers and library technology staff
-from around the globe.
-
-
-STRUCTURE
-=========
-
-Koha 3.0 has been restructured from Koha 2.2 to use Zebra,
-a high-performance, general-purpose structured text indexing and
-retrieval engine.  Zebra speaks Z39.50, building on one of Koha's most
-useful features.
-
-General library data is held in MySQL, and Koha 3.0 supports MySQL 5,
-using foreign keys and other recent features.
-
-Apache 2 is the recommended web server and VirtualHost configuration
-files are generated for it.
+Koha - award-winning open-source Integrated Library System
 
+Koha is the first open-source Integrated Library System. Developed initially in
+New Zealand by Katipo Communications, Ltd and first deployed in January of 2000
+for the Horowhenua Library Trust, it is currently maintained by a team of
+software providers and library technology staff from around the globe. Learn
+more about the Koha project at http://koha.org.
 
 INSTALLATION
 ============
@@ -31,12 +15,9 @@ how to customise CPAN-installed modules, the same things should work
 for you with Koha.  If not, don't worry.  If you want to customise the
 installation more than described below, run "man ExtUtils::MakeMaker"
 
-Koha 3.0 introduces multi-dbms support. With this release you may elect
-to install over MySQL 5 or PostgreSQL 8.2.5. Further databases will
-be added over time.
-
 You need to have a server running MySQL 5 or PostgreSQL 8.2.5, Zebra
-and some webserver (preferably Apache) before installing Koha.
+2.0.22 or greater and a webserver (preferably Apache2) before installing
+Koha.
  
 MySQL 5: Create a database called 'koha,' owned by 'kohaadmin'
 user, with a password set. Note: kohaadmin must have at least the
@@ -54,10 +35,14 @@ Default installation instructions:
 2. make
 3.(optional) make test 
 4. sudo make install
-5. ln -s /etc/koha/koha-httpd.conf /etc/apache2/sites-available/koha
-6. a2enmod rewrite
-7. a2ensite koha && /etc/init.d/apache2 reload
-8. zebrasrv -f /etc/koha/koha-conf.xml
+5. sudo ln -s /etc/koha/koha-httpd.conf /etc/apache2/sites-available/koha
+  (note that the path to koha-httpd.conf may be different depending on your
+  installation choices)
+6. sudo a2enmod rewrite
+7. sudo a2ensite koha && /etc/init.d/apache2 reload
+8. sudo zebrasrv -f /etc/koha/koha-conf.xml
+  (note that you will want to run Zebra in daemon mode for a production
+  system)
 9. Browse to http://servername:8080/ and answer the questions
 
 OR if you want to install all dependencies from CPAN and are root, you can
@@ -67,11 +52,13 @@ may not be safe.  Nevertheless, it's pretty cool when it works.
 The defaults will install Koha to places that follow relevant standards,
 such as the File Hierarchy Standard.  If you want to install Koha to a
 different directory like /opt/koha, then replace step 1 with (for example):
+
 1. perl Makefile.PL INTRANET_CGI_DIR=/www/cgi-bin
 
 You can change most of the defaults in a similar way, such as DB_HOST.
 For full instructions on how to override the default settings, run
-perldoc rewrite-config.PL
+
+$ perldoc rewrite-config.PL
 
 
 IF YOU HAVE PROBLEMS

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc
index f7dc367..c552663 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc
@@ -2,10 +2,10 @@
        <li><a href="/cgi-bin/koha/tools/tools-home.pl">Tools Home</a></li>
        <li><a href="/cgi-bin/koha/tools/koha-news.pl">News</a></li>
        <li><a href="/cgi-bin/koha/labels/label-home.pl">Labels (spine and barcode)</a></li>
-       <li><a href="/cgi-bin/koha/tools/holidays.pl">Holidays</a></li>
+       <li><a href="/cgi-bin/koha/tools/holidays.pl">Calendar</a></li>
        <li><a href="/cgi-bin/koha/tools/letter.pl">Notices</a></li>
        <li><a href="/cgi-bin/koha/tools/overduerules.pl">Notice/status triggers</a></li>
-       <li><a href="/cgi-bin/koha/reviews/reviewswaiting.pl">Manage OPAC reviews</a></li>
+       <li><a href="/cgi-bin/koha/reviews/reviewswaiting.pl">Moderate OPAC comments</a></li>
        <li><a href="/cgi-bin/koha/tools/viewlog.pl">Log viewer</a></li>
        <li><a href="/cgi-bin/koha/tools/inventory.pl">Inventory/stocktaking</a></li>
        <li><a href="/cgi-bin/koha/tools/stage-marc-import.pl">MARC Import (staging)</a></li>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reviews/reviewswaiting.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reviews/reviewswaiting.tmpl
index 76d96b9..036afe5 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reviews/reviewswaiting.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reviews/reviewswaiting.tmpl
@@ -1,12 +1,12 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha &rsaquo; Reviews waiting for Approval</title>
+<title>Koha &rsaquo; Comments waiting for Approval</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 <!--TMPL_INCLUDE NAME="cat-search.inc" -->
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; Reviews Waiting for Approval</div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; Comments Awaiting Moderation</div>
 
 <div id="doc3" class="yui-t2">
    
@@ -14,7 +14,7 @@
        <div id="yui-main">
        <div class="yui-b">
 
-<h1>Reviews</h1>
+<h1>Comments</h1>
 
 <!-- TMPL_IF NAME="reviews" -->
 <table>
@@ -26,7 +26,7 @@
             On biblio
         </th>
         <th>
-            Review
+            Comment
         </th>
         <th>
             &nbsp;
@@ -52,7 +52,7 @@
     <!-- /TMPL_LOOP -->
 </table>
 <!-- TMPL_ELSE -->
-<b>No reviews awaiting approval or deletion</b>
+<b>No comments to moderate</b>
 <!-- /TMPL_IF -->
 
 </div>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tmpl
index 8511763..7820a9b 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tmpl
@@ -15,16 +15,16 @@
 <div class="yui-u first">
 <dl>
     <dt><a href="/cgi-bin/koha/tools/koha-news.pl">News</a></dt>
-    <dd>Write news for the OPAC and staff interfaces.</dd>
+    <dd>Write news for the OPAC and staff interfaces</dd>
        
     <dt><a href="/cgi-bin/koha/labels/label-home.pl">Label creator</a></dt>
-    <dd>Create printable labels and barcodes from catalog data.</dd>
+    <dd>Create printable labels and barcodes from catalog data</dd>
 
-    <dt><a href="/cgi-bin/koha/tools/holidays.pl">Holidays</a></dt>
-    <dd>Define holidays (days where the library is closed)</dd>
+    <dt><a href="/cgi-bin/koha/tools/holidays.pl">Calendar</a></dt>
+    <dd>Define days when the library is closed</dd>
 
-    <dt><a href="/cgi-bin/koha/reviews/reviewswaiting.pl">Reviews</a></dt>
-       <dd>Manage OPAC reviews</dd>
+    <dt><a href="/cgi-bin/koha/reviews/reviewswaiting.pl">Comments</a></dt>
+       <dd>Moderate patron comments</dd>
 
        </dl>
 </div>
@@ -50,13 +50,13 @@
     <dd>Stage MARC records into the reservoir.</dd>
 
     <dt><a href="/cgi-bin/koha/tools/manage-marc-import.pl">Manage Staged MARC Records</a></dt>
-    <dd>Managed staged MARC records, including completing and reversing imports.</dd>
+    <dd>Managed staged MARC records, including completing and reversing imports</dd>
 
     <dt><a href="/cgi-bin/koha/tools/export.pl">Export bibliographic and holdings</a></dt>
     <dd>Export bibliographic and holdings data</dd>
 
     <dt><a href="/cgi-bin/koha/tools/import_borrowers.pl">Import patrons</a></dt>
-    <dd>Import patron data.</dd>
+    <dd>Import patron data</dd>
 
     <dt><a href="/cgi-bin/koha/tools/cleanborrowers.pl">Patrons (anonomize, bulk-delete)</a></dt>
     <dd>Delete old borrowers and anonymize circulation history (deletes borrower reading history)</dd>