[Koha-docs] Rotating Collections documentation for 3.18.0 (patch 1 of 2)
Nicole Engard
nengard at gmail.com
Mon Nov 10 16:20:47 CET 2014
Cindy and/or Git experts,
I get the following error:
Nicole-Pro:manual nengard$ git am -3 -i -u rot1.patch
Commit Body is:
--------------------------
Rotating Collections documentation for 3.18.0 (patch 1 of 2)
--001a11c11c2ca7ad0505073773aa
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable
>From 2eb634cb0de25d63ae4f2b25ba9e6cb4b540435b Mon Sep 17 00:00:00 2001
From: Cindy Murdock Ames <cmurdock at ccfls.org>
Date: Thu, 6 Nov 2014 16:23:48 -0500
Subject: [PATCH 1/2] Rotating Collections documentation for 3.18.0
--------------------------
Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all y
Applying: Rotating Collections documentation for 3.18.0 (patch 1 of 2)
fatal: corrupt patch at line 15
Repository lacks necessary blobs to fall back on 3-way merge.
Cannot fall back to three-way merge.
Patch failed at 0001 Rotating Collections documentation for 3.18.0
(patch 1 of 2)
The copy of the patch that failed is found in:
/Users/nengard/manual/.git/rebase-apply/patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Nicole-Pro:manual nengard$
On Thu, Nov 6, 2014 at 3:33 PM, Cindy Murdock Ames <cmurdock at ccfls.org> wrote:
> From 2eb634cb0de25d63ae4f2b25ba9e6cb4b540435b Mon Sep 17 00:00:00 2001
> From: Cindy Murdock Ames <cmurdock at ccfls.org>
> Date: Thu, 6 Nov 2014 16:23:48 -0500
> Subject: [PATCH 1/2] Rotating Collections documentation for 3.18.0
>
> ---
> en/manual.xml | 88
> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
> 1 file changed, 87 insertions(+), 1 deletion(-)
>
> diff --git a/en/manual.xml b/en/manual.xml
> index 3802642..7cf338e 100644
> --- a/en/manual.xml
> +++ b/en/manual.xml
> @@ -1,4 +1,4 @@
> -<?xml version="1.0" encoding="UTF-8"?>
> +<?xml version="1.0" encoding="UTF-8"?>
> <!-- This document is maintained with oXygen. -->
> <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
> "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
> <book>
> @@ -20550,6 +20550,92 @@ location: [STAFF, ISO]</programlisting>Will block
> items with an itype code of
> </section>
> </section>
>
> + <section id="rotatingcollections">
> + <title>Rotating Collections</title>
> + <itemizedlist>
> + <listitem>
> + <para><emphasis>Get there:</emphasis> More > Tools > Catalog >
> Rotating Collections</para>
> + </listitem>
> + </itemizedlist>
> +
> + <para>Rotating Collections is a tool for managing collections of
> materials that frequently get shifted from library to library.
> + It adds the ability to store not only an item's home library and
> current location but also information about where it is supposed
> + to be transferred to next to ensure that all items in the collection
> are sent to the correct library. When an item in a rotating
> + collection is checked in, library staff is notified that the item is
> part of a rotating collection and which branch it should be
> + sent to if it is not at the correct one.</para>
> +
> + <important>
> + <para>The "AutomaticItemReturn" system preference must be set to "Don't
> automatically transfer items to their home library when they are returned"
> + for Rotating Collections to function properly.</para>
> + </important>
> +
> + <itemizedlist>
> + <listitem>
> + <para>To create a new rotating collection, click the "New Collection"
> button, fill in the Title and Description, and click Submit.
> + Once submitted you'll see "Collection Name added successfully"; click
> "Return to rotating collections home" to return to the main
> + Rotating Collections management page (or click Rotating Collections in
> the sidebar).</para>
> + </listitem>
> +
> + <listitem>
> + <para>To add items to a collection, click "Add or remove items" next to
> the collection's name in the list of collections.
> + Under "Add or remove items" scan or type in the barcode of the item you
> wish to add to the collection, and hit Enter or click
> + Submit if necessary.</para>
> + </listitem>
> +
> + <listitem>
> + <para>To remove an item from a collection, either click Remove next to
> the item's barcode in the list of items within the collection
> + or check the "Remove item from collection" box next to the Barcode text
> box under "Add or remove items, and scan or type in the barcode,
> + clicking Submit or hitting Enter if necessary. Note: The "Remove item
> from collection" checkbox will remain checked as long as you are on
> + the "Add or remove items" page, unless you uncheck it, to facilitate
> quickly removing a number of items at a time by scanning their barcodes.
> </para>
> + </listitem>
> + </itemizedlist>
> +
> + <section id="transferrotatingcollection">
> + <title>Transfer a Rotating Collection</title>
> +
> + <para>Transferring a collection will:</para>
> + <itemizedlist>
> + <listitem>
> + <para>Change the current location of the items in that collection
> to the library it is to be transferred to</para>
> + </listitem>
> + <listitem>
> + <para>Initiate a transfer from its original current
> location/holding library to the current location/holding library it is to be
> rotated to.
> + When a library receives a collection they will need to check in
> the items to complete the transfer.</para>
> + </listitem>
> + </itemizedlist>
> +
> + <para>You can transfer a collection in one of two ways:</para>
> +
> + <itemizedlist>
> + <listitem>
> + <para>From the main Rotating Collections page, click on Transfer
> next to the title of the collection you wish to transfer; choose
> + the library you wish to transfer the collection to and click
> "Transfer collection".</para>
> + </listitem>
> + <listitem>
> + <para>Or, from the "add or remove items" page for a collection, you
> can click the Transfer button, choose the library you wish to
> + transfer the collection to and click "Transfer
> Collection".</para>
> + </listitem>
> + </itemizedlist>
> +
> + <important>
> + <para>In order to complete the transfer process, the library receiving
> the rotating collection should check in all items from the collection
> + as they receive them. This will clear the transfer so that the items
> are no longer shown as being "in transit".</para>
> + </important>
> +
> + <para>If an item in a rotating collection is checked in at a library
> other than the one it is supposed to be transferred to, a notification
> + will appear notifying library staff that the item is part of a rotating
> collection, also letting them know where the item needs to be sent.</para>
> +
> + <screenshot>
> + <screeninfo>Rotating Collection Item Notification</screeninfo>
> + <mediaobject>
> + <imageobject>
> + <imagedata
> fileref="images/tools/rotatingcollections/rotatingcollectionnotice.png"/>
> + </imageobject>
> + </mediaobject>
> + </screenshot>
> + </section>
> +</section>
> +
> <section id="catalogtools">
> <title>Catalog</title>
>
> --
> 1.9.1
>
> -----------------------------------------------------------
> Cindy Murdock Ames
> IT Services Director
> Meadville Public Library | CCFLS
> http://meadvillelibrary.org | http://ccfls.org
>
> Please report tech support issues in Mantis:
> http://tracker.ccfls.org/mantis
>
> _______________________________________________
> Koha-docs mailing list
> Koha-docs at lists.koha-community.org
> https://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-docs
>
More information about the Koha-docs
mailing list