Erica, I want to help push your docs into master. I just did a test on the physical_char_wiz branch with git cherry-pick[1] with the "-n" flag so that I could remove the Thumbs.db before re-committing, and it worked fine. I did not push it yet, because I would like to ask you something first.
In all your edits you did not specify where you would like the new documentation to show up in the docs. To do this we normally make edits to the docs/root.txt file. You would need to add a line like the following to the root.txt file to make your files show up within the official docs.... include::admin/name_of_your_file.txt[] Note, that there needs to be two empty straight brackets "[]" at the end of the file name. Also, the "admin" refers to the name of a folder that we might choose to use to store your new files. Some of ther options for folders are "cataloging", "circulation", etc. Here is a direct link to how that file looks in master right now... http://git.evergreen-ils.org/?p=Evergreen.git;a=blob;f=docs/root.txt;h=254abccaae0bb7f7e6bee65339a71377f5212756;hb=HEAD You will see that depending on which line you use to place the new files, it will decide on what chapter/section the new content will appear in the final docs. I can create those root.txt edits by myself with your guidance of where you want the docs to show up, or you can make the edits yourself (with my help). Let me know, Yamil On Mon, Jul 14, 2014 at 7:15 PM, Erica Rohlfs <[email protected]> wrote: > Hi Dan, > > Thank you for catching that. I appreciate it. There are a few links > regarding the routing list that should be ignored. I was combating format > issues. Also of note, the Physical Characteristic Wizard > (http://git.evergreen-ils.org/?p=working/Evergreen.git;a=shortlog;h=refs/heads/user/ericar/physical_char_wiz) > includes the Thumbs.db file that could not be ignored locally (and would not > delete). Galen pushed a patch to have git ignore Thumbs.db globally. > Hopefully, it won't rear its head in the final merge. Thank you again for > noticing, Dan! > > The following links are: > > http://git.evergreen-ils.org/?p=working/Evergreen.git;a=shortlog;h=refs/heads/user/ericar/marc_rad_mvf_cra > > http://git.evergreen-ils.org/?p=working/Evergreen.git;a=shortlog;h=refs/heads/user/ericar/tpac_metarecord_search_hold > > http://git.evergreen-ils.org/?p=working/Evergreen.git;a=shortlog;h=refs/heads/user/ericar/marc_fixed_fields > > http://git.evergreen-ils.org/?p=working/Evergreen.git;a=shortlog;h=refs/heads/user/ericar/physical_char_wiz > > http://git.evergreen-ils.org/?p=working/Evergreen.git;a=shortlog;h=refs/heads/user/ericar/routing_list_creation > > > Have a great evening! > > Erica > > > On Mon, Jul 14, 2014 at 5:52 PM, Dan Scott <[email protected]> wrote: >> >> On Mon, Jul 14, 2014 at 04:33:51PM -0400, Erica Rohlfs wrote: >>> >>> Good Afternoon (again)! >>> >>> I just pushed the docs for MARC Record Attribute Definitions, including >>> the >>> descriptions of Multi-Valued Fields and Composite Record Attributes, and >>> how to modify them. >> >> >> Hi Erica: >> >> Can you provide links to the particular branches that you would like >> people to merge to master? There are a bunch of recent branches at >> http://git.evergreen-ils.org/?p=working/Evergreen.git;a=heads that look >> like they might be yours; for example: >> >> * >> http://git.evergreen-ils.org/?p=working/Evergreen.git;a=shortlog;h=refs/heads/user/ericar/marc_rad_mvf_cra >> * >> http://git.evergreen-ils.org/?p=working/Evergreen.git;a=shortlog;h=refs/heads/user/ericar/tpac_metarecord_search_hold >> * >> http://git.evergreen-ils.org/?p=working/Evergreen.git;a=shortlog;h=refs/heads/user/ericar/marc_fixed_fields >> * >> http://git.evergreen-ils.org/?p=working/Evergreen.git;a=shortlog;h=refs/heads/user/ericar/physical_char_wiz >> * >> http://git.evergreen-ils.org/?p=working/Evergreen.git;a=shortlog;h=refs/heads/user/ericar/routing_list_creation >> * >> http://git.evergreen-ils.org/?p=working/Evergreen.git;a=shortlog;h=refs/heads/user/ericar/ascv_create_routing_list >> >> Dan >> _______________________________________________ >> OPEN-ILS-DOCUMENTATION mailing list >> [email protected] >> http://list.georgialibraries.org/mailman/listinfo/open-ils-documentation > > > > > -- > > Erica Rohlfs > Education Librarian > Equinox Software Inc. / The Open Source Experts > Phone: 770-709-5572 | 1-877-OPEN-ILS (673-6457) x5572 > Email: [email protected] > Web: http://www.esilibrary.com > > > _______________________________________________ > OPEN-ILS-DOCUMENTATION mailing list > [email protected] > http://list.georgialibraries.org/mailman/listinfo/open-ils-documentation > -- -------------------------------- Yamil Suarez, MCS Library System Administrator/Developer Stan Getz Library Berklee College of Music 1140 Boylston St Boston, MA 02215 [email protected] 617-747-2617 _______________________________________________ OPEN-ILS-DOCUMENTATION mailing list [email protected] http://list.georgialibraries.org/mailman/listinfo/open-ils-documentation
