From 6d04991fb467fdaceaa9567708d32b292235f5a0 Mon Sep 17 00:00:00 2001 From: ticheler Date: Fri, 8 Dec 2023 10:31:20 +0100 Subject: [PATCH] Edited small typos and text. Some link fixes. Signed-off-by: ticheler --- SECURITY.md | 14 +- docs/README.md | 7 +- docs/manual/LICENSE | 319 ++++++++++++++++++ docs/manual/README.md | 20 +- docs/manual/docs/help/index.md | 2 +- docs/manual/docs/help/map/index.md | 2 +- .../installing-from-source-code.md | 2 +- docs/manual/docs/overview/about.md | 2 +- docs/manual/docs/overview/authors.md | 4 +- docs/manual/docs/overview/change-log/index.md | 2 +- .../deleting-metadata.md | 2 +- .../editing-metadata.md | 16 +- .../describing-information/index.md | 6 +- .../managing-templates.md | 2 +- docs/manual/mkdocs.yml | 4 +- 15 files changed, 361 insertions(+), 43 deletions(-) create mode 100644 docs/manual/LICENSE diff --git a/SECURITY.md b/SECURITY.md index 85ce30ec6b0..a57cbf320f8 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -2,20 +2,20 @@ The GeoNetwork community takes the security of the software and all services based on the software product seriously. On this page you can find the versions for which the community provides security patches. -If you believe you have found a security vulnerability in the software or an implementation of the software, please report it to geonetwork@osgeo.org as described below. Do not publish the vulnerability in any public forums (such as twitter, email list or issue tracker). +If you believe you have found a security vulnerability in the software or an implementation of the software, please report it to geonetwork@osgeo.org as described below. Do not publish the vulnerability in any public forums (such as Twitter/X, email list or issue tracker). ## Supported Versions Each GeoNetwork release is supported with bug fixes for a limited period, with patch releases made approximately every three to six months. -- We recommend to update to latest incremental release as soon as possible to address security vulnarabilities. +- We recommend to update to latest incremental release as soon as possible to address security vulnerabilities. - Some overlap is provided when major versions are announced with both a current version and a maintenance version being made available to provide time for organizations to upgrade. -| Version | Supported | Comment | -|---------| ------------------ |------------------------ | -| 4.4.x | :white_check_mark: | Current version | -| 4.2.x | :white_check_mark: | Maintenance version | -| 3.12.x | :white_check_mark: | Maintenance version | +| Version | Supported | Comment | +|---------|--------------------|---------------------| +| 4.4.x | :white_check_mark: | Latest version | +| 4.2.x | :white_check_mark: | Stable version | +| 3.12.x | :white_check_mark: | Maintenance version | If your organisation is making use of a GeoNetwork version that is no longer in use by the community all is not lost. You can volunteer on the developer list to make additional releases, or engage with one of our [Commercial Support](https://www.osgeo.org/service-providers/?p=geonetwork) providers. diff --git a/docs/README.md b/docs/README.md index d97e063a283..67dc7dd7004 100644 --- a/docs/README.md +++ b/docs/README.md @@ -1,11 +1,10 @@ # Documentation - This module contains: -* `manual` in Markdown format for mkdocs -* `manuals` in RST format for sphinx-build (vai https://github.com/geonetwork/doc) +* `manual` in Markdown format for MkDocs +* `manuals` in RST format for sphinx-build (via https://github.com/geonetwork/doc) - Legacy * Change logs txt files * [copyright.txt](copyright.txt) Copyright template * `licenses` for library * Utility folder with scripts to generate extra docs -* `translate` python module for help with sphinx-build to mkdocs +* `translate` python module for help with Sphinx-build migration to MkDocs diff --git a/docs/manual/LICENSE b/docs/manual/LICENSE new file mode 100644 index 00000000000..1d658d6d376 --- /dev/null +++ b/docs/manual/LICENSE @@ -0,0 +1,319 @@ +Creative Commons Legal Code + +Attribution 3.0 Unported + + CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE + LEGAL SERVICES. DISTRIBUTION OF THIS LICENSE DOES NOT CREATE AN + ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS + INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES + REGARDING THE INFORMATION PROVIDED, AND DISCLAIMS LIABILITY FOR + DAMAGES RESULTING FROM ITS USE. + +License + +THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE +COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY +COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS +AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED. + +BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE +TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY +BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS +CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND +CONDITIONS. + +1. Definitions + + a. "Adaptation" means a work based upon the Work, or upon the Work and + other pre-existing works, such as a translation, adaptation, + derivative work, arrangement of music or other alterations of a + literary or artistic work, or phonogram or performance and includes + cinematographic adaptations or any other form in which the Work may be + recast, transformed, or adapted including in any form recognizably + derived from the original, except that a work that constitutes a + Collection will not be considered an Adaptation for the purpose of + this License. For the avoidance of doubt, where the Work is a musical + work, performance or phonogram, the synchronization of the Work in + timed-relation with a moving image ("synching") will be considered an + Adaptation for the purpose of this License. + b. "Collection" means a collection of literary or artistic works, such as + encyclopedias and anthologies, or performances, phonograms or + broadcasts, or other works or subject matter other than works listed + in Section 1(f) below, which, by reason of the selection and + arrangement of their contents, constitute intellectual creations, in + which the Work is included in its entirety in unmodified form along + with one or more other contributions, each constituting separate and + independent works in themselves, which together are assembled into a + collective whole. A work that constitutes a Collection will not be + considered an Adaptation (as defined above) for the purposes of this + License. + c. "Distribute" means to make available to the public the original and + copies of the Work or Adaptation, as appropriate, through sale or + other transfer of ownership. + d. "Licensor" means the individual, individuals, entity or entities that + offer(s) the Work under the terms of this License. + e. "Original Author" means, in the case of a literary or artistic work, + the individual, individuals, entity or entities who created the Work + or if no individual or entity can be identified, the publisher; and in + addition (i) in the case of a performance the actors, singers, + musicians, dancers, and other persons who act, sing, deliver, declaim, + play in, interpret or otherwise perform literary or artistic works or + expressions of folklore; (ii) in the case of a phonogram the producer + being the person or legal entity who first fixes the sounds of a + performance or other sounds; and, (iii) in the case of broadcasts, the + organization that transmits the broadcast. + f. "Work" means the literary and/or artistic work offered under the terms + of this License including without limitation any production in the + literary, scientific and artistic domain, whatever may be the mode or + form of its expression including digital form, such as a book, + pamphlet and other writing; a lecture, address, sermon or other work + of the same nature; a dramatic or dramatico-musical work; a + choreographic work or entertainment in dumb show; a musical + composition with or without words; a cinematographic work to which are + assimilated works expressed by a process analogous to cinematography; + a work of drawing, painting, architecture, sculpture, engraving or + lithography; a photographic work to which are assimilated works + expressed by a process analogous to photography; a work of applied + art; an illustration, map, plan, sketch or three-dimensional work + relative to geography, topography, architecture or science; a + performance; a broadcast; a phonogram; a compilation of data to the + extent it is protected as a copyrightable work; or a work performed by + a variety or circus performer to the extent it is not otherwise + considered a literary or artistic work. + g. "You" means an individual or entity exercising rights under this + License who has not previously violated the terms of this License with + respect to the Work, or who has received express permission from the + Licensor to exercise rights under this License despite a previous + violation. + h. "Publicly Perform" means to perform public recitations of the Work and + to communicate to the public those public recitations, by any means or + process, including by wire or wireless means or public digital + performances; to make available to the public Works in such a way that + members of the public may access these Works from a place and at a + place individually chosen by them; to perform the Work to the public + by any means or process and the communication to the public of the + performances of the Work, including by public digital performance; to + broadcast and rebroadcast the Work by any means including signs, + sounds or images. + i. "Reproduce" means to make copies of the Work by any means including + without limitation by sound or visual recordings and the right of + fixation and reproducing fixations of the Work, including storage of a + protected performance or phonogram in digital form or other electronic + medium. + +2. Fair Dealing Rights. Nothing in this License is intended to reduce, +limit, or restrict any uses free from copyright or rights arising from +limitations or exceptions that are provided for in connection with the +copyright protection under copyright law or other applicable laws. + +3. License Grant. Subject to the terms and conditions of this License, +Licensor hereby grants You a worldwide, royalty-free, non-exclusive, +perpetual (for the duration of the applicable copyright) license to +exercise the rights in the Work as stated below: + + a. to Reproduce the Work, to incorporate the Work into one or more + Collections, and to Reproduce the Work as incorporated in the + Collections; + b. to create and Reproduce Adaptations provided that any such Adaptation, + including any translation in any medium, takes reasonable steps to + clearly label, demarcate or otherwise identify that changes were made + to the original Work. For example, a translation could be marked "The + original work was translated from English to Spanish," or a + modification could indicate "The original work has been modified."; + c. to Distribute and Publicly Perform the Work including as incorporated + in Collections; and, + d. to Distribute and Publicly Perform Adaptations. + e. For the avoidance of doubt: + + i. Non-waivable Compulsory License Schemes. In those jurisdictions in + which the right to collect royalties through any statutory or + compulsory licensing scheme cannot be waived, the Licensor + reserves the exclusive right to collect such royalties for any + exercise by You of the rights granted under this License; + ii. Waivable Compulsory License Schemes. In those jurisdictions in + which the right to collect royalties through any statutory or + compulsory licensing scheme can be waived, the Licensor waives the + exclusive right to collect such royalties for any exercise by You + of the rights granted under this License; and, + iii. Voluntary License Schemes. The Licensor waives the right to + collect royalties, whether individually or, in the event that the + Licensor is a member of a collecting society that administers + voluntary licensing schemes, via that society, from any exercise + by You of the rights granted under this License. + +The above rights may be exercised in all media and formats whether now +known or hereafter devised. The above rights include the right to make +such modifications as are technically necessary to exercise the rights in +other media and formats. Subject to Section 8(f), all rights not expressly +granted by Licensor are hereby reserved. + +4. Restrictions. The license granted in Section 3 above is expressly made +subject to and limited by the following restrictions: + + a. You may Distribute or Publicly Perform the Work only under the terms + of this License. You must include a copy of, or the Uniform Resource + Identifier (URI) for, this License with every copy of the Work You + Distribute or Publicly Perform. You may not offer or impose any terms + on the Work that restrict the terms of this License or the ability of + the recipient of the Work to exercise the rights granted to that + recipient under the terms of the License. You may not sublicense the + Work. You must keep intact all notices that refer to this License and + to the disclaimer of warranties with every copy of the Work You + Distribute or Publicly Perform. When You Distribute or Publicly + Perform the Work, You may not impose any effective technological + measures on the Work that restrict the ability of a recipient of the + Work from You to exercise the rights granted to that recipient under + the terms of the License. This Section 4(a) applies to the Work as + incorporated in a Collection, but this does not require the Collection + apart from the Work itself to be made subject to the terms of this + License. If You create a Collection, upon notice from any Licensor You + must, to the extent practicable, remove from the Collection any credit + as required by Section 4(b), as requested. If You create an + Adaptation, upon notice from any Licensor You must, to the extent + practicable, remove from the Adaptation any credit as required by + Section 4(b), as requested. + b. If You Distribute, or Publicly Perform the Work or any Adaptations or + Collections, You must, unless a request has been made pursuant to + Section 4(a), keep intact all copyright notices for the Work and + provide, reasonable to the medium or means You are utilizing: (i) the + name of the Original Author (or pseudonym, if applicable) if supplied, + and/or if the Original Author and/or Licensor designate another party + or parties (e.g., a sponsor institute, publishing entity, journal) for + attribution ("Attribution Parties") in Licensor's copyright notice, + terms of service or by other reasonable means, the name of such party + or parties; (ii) the title of the Work if supplied; (iii) to the + extent reasonably practicable, the URI, if any, that Licensor + specifies to be associated with the Work, unless such URI does not + refer to the copyright notice or licensing information for the Work; + and (iv) , consistent with Section 3(b), in the case of an Adaptation, + a credit identifying the use of the Work in the Adaptation (e.g., + "French translation of the Work by Original Author," or "Screenplay + based on original Work by Original Author"). The credit required by + this Section 4 (b) may be implemented in any reasonable manner; + provided, however, that in the case of a Adaptation or Collection, at + a minimum such credit will appear, if a credit for all contributing + authors of the Adaptation or Collection appears, then as part of these + credits and in a manner at least as prominent as the credits for the + other contributing authors. For the avoidance of doubt, You may only + use the credit required by this Section for the purpose of attribution + in the manner set out above and, by exercising Your rights under this + License, You may not implicitly or explicitly assert or imply any + connection with, sponsorship or endorsement by the Original Author, + Licensor and/or Attribution Parties, as appropriate, of You or Your + use of the Work, without the separate, express prior written + permission of the Original Author, Licensor and/or Attribution + Parties. + c. Except as otherwise agreed in writing by the Licensor or as may be + otherwise permitted by applicable law, if You Reproduce, Distribute or + Publicly Perform the Work either by itself or as part of any + Adaptations or Collections, You must not distort, mutilate, modify or + take other derogatory action in relation to the Work which would be + prejudicial to the Original Author's honor or reputation. Licensor + agrees that in those jurisdictions (e.g. Japan), in which any exercise + of the right granted in Section 3(b) of this License (the right to + make Adaptations) would be deemed to be a distortion, mutilation, + modification or other derogatory action prejudicial to the Original + Author's honor and reputation, the Licensor will waive or not assert, + as appropriate, this Section, to the fullest extent permitted by the + applicable national law, to enable You to reasonably exercise Your + right under Section 3(b) of this License (right to make Adaptations) + but not otherwise. + +5. Representations, Warranties and Disclaimer + +UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR +OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY +KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, +INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, +FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF +LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, +WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION +OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU. + +6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE +LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR +ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES +ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS +BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + +7. Termination + + a. This License and the rights granted hereunder will terminate + automatically upon any breach by You of the terms of this License. + Individuals or entities who have received Adaptations or Collections + from You under this License, however, will not have their licenses + terminated provided such individuals or entities remain in full + compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will + survive any termination of this License. + b. Subject to the above terms and conditions, the license granted here is + perpetual (for the duration of the applicable copyright in the Work). + Notwithstanding the above, Licensor reserves the right to release the + Work under different license terms or to stop distributing the Work at + any time; provided, however that any such election will not serve to + withdraw this License (or any other license that has been, or is + required to be, granted under the terms of this License), and this + License will continue in full force and effect unless terminated as + stated above. + +8. Miscellaneous + + a. Each time You Distribute or Publicly Perform the Work or a Collection, + the Licensor offers to the recipient a license to the Work on the same + terms and conditions as the license granted to You under this License. + b. Each time You Distribute or Publicly Perform an Adaptation, Licensor + offers to the recipient a license to the original Work on the same + terms and conditions as the license granted to You under this License. + c. If any provision of this License is invalid or unenforceable under + applicable law, it shall not affect the validity or enforceability of + the remainder of the terms of this License, and without further action + by the parties to this agreement, such provision shall be reformed to + the minimum extent necessary to make such provision valid and + enforceable. + d. No term or provision of this License shall be deemed waived and no + breach consented to unless such waiver or consent shall be in writing + and signed by the party to be charged with such waiver or consent. + e. This License constitutes the entire agreement between the parties with + respect to the Work licensed here. There are no understandings, + agreements or representations with respect to the Work not specified + here. Licensor shall not be bound by any additional provisions that + may appear in any communication from You. This License may not be + modified without the mutual written agreement of the Licensor and You. + f. The rights granted under, and the subject matter referenced, in this + License were drafted utilizing the terminology of the Berne Convention + for the Protection of Literary and Artistic Works (as amended on + September 28, 1979), the Rome Convention of 1961, the WIPO Copyright + Treaty of 1996, the WIPO Performances and Phonograms Treaty of 1996 + and the Universal Copyright Convention (as revised on July 24, 1971). + These rights and subject matter take effect in the relevant + jurisdiction in which the License terms are sought to be enforced + according to the corresponding provisions of the implementation of + those treaty provisions in the applicable national law. If the + standard suite of rights granted under applicable copyright law + includes additional rights not granted under this License, such + additional rights are deemed to be included in the License; this + License is not intended to restrict the license of any rights under + applicable law. + + +Creative Commons Notice + + Creative Commons is not a party to this License, and makes no warranty + whatsoever in connection with the Work. Creative Commons will not be + liable to You or any party on any legal theory for any damages + whatsoever, including without limitation any general, special, + incidental or consequential damages arising in connection to this + license. Notwithstanding the foregoing two (2) sentences, if Creative + Commons has expressly identified itself as the Licensor hereunder, it + shall have all rights and obligations of Licensor. + + Except for the limited purpose of indicating to the public that the + Work is licensed under the CCPL, Creative Commons does not authorize + the use by either party of the trademark "Creative Commons" or any + related trademark or logo of Creative Commons without the prior + written consent of Creative Commons. Any permitted use will be in + compliance with Creative Commons' then-current trademark usage + guidelines, as may be published on its website or otherwise made + available upon request from time to time. For the avoidance of doubt, + this trademark restriction does not form part of this License. + + Creative Commons may be contacted at http://creativecommons.org/. diff --git a/docs/manual/README.md b/docs/manual/README.md index 67b9ce2ffc7..6a32791b9e9 100644 --- a/docs/manual/README.md +++ b/docs/manual/README.md @@ -1,12 +1,12 @@ -# Geonetwork Manual and Help +# GeoNetwork Manual and Help -Documentation for GeoNetwork opensource is available via https://geonetwork-opensource.org. +Documentation for GeoNetwork opensource is available via https://docs.geonetwork-opensource.org. -This documentation is written under the creative commons license [Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0)](LICENSE.md). +This documentation is written under the Creative Commons license [Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0)](LICENSE). Reference: -* [Documentation Writing Guide](docs/devel/docs/docs.md) +* [Documentation Writing Guide](docs/devel/docs/index.md) ## Communication @@ -14,9 +14,9 @@ The [project issue tracker](https://github.com/geonetwork/core-geonetwork/issues ## Material for MkDocs -Documentation is [mkdocs-material](https://squidfunk.github.io/mkdocs-material/) which is a Markdown documentation framework written on top of [MkDocs](https://www.mkdocs.org/). +Documentation is [MkDocs-material](https://squidfunk.github.io/mkdocs-material/) which is a Markdown documentation framework written on top of [MkDocs](https://www.mkdocs.org/). -If you are using python3: +If you are using Python3: 1. Install using ``pip3`` and build: @@ -45,7 +45,7 @@ If you are using python3: ### VirtualEnv -If you use a python virtual environment: +If you use a Python virtual environment: 1. Activate virtual environment: @@ -65,9 +65,9 @@ If you use a python virtual environment: ### Docker -If you are not familiar with python the mkdocs-material website has instructions for docker: +If you are not familiar with Python the MkDocs-material website has instructions for Docker: -1. Run mkdocs in Docker environment: +1. Run MkDocs in Docker environment: ``` docker pull squidfunk/mkdocs-material @@ -90,7 +90,7 @@ If you are not familiar with python the mkdocs-material website has instructions 3. Both ``install`` and ``deploy`` are skipped (so ``mvn clean install`` is fine). -4. Use default profile to only build the default english docs: +4. Use default profile to only build the default English docs: ``` mvn install -Pdefault diff --git a/docs/manual/docs/help/index.md b/docs/manual/docs/help/index.md index 418cf1b02fa..8193a33d53e 100644 --- a/docs/manual/docs/help/index.md +++ b/docs/manual/docs/help/index.md @@ -6,7 +6,7 @@ This catalogue lists records of available datasets. The catalogue uses ***GeoNetwork*** technology for listing, searching and reviewing records. -GeoNetwork is a catalog application to manage spatially referenced resources. It provides powerful metadata editing and search functions as well as an interactive web map viewer. GeoNetwork is widely used as the foundation of Spatial Data Infrastructures world wide. +GeoNetwork is a catalog application to manage spatially referenced resources. It provides powerful metadata editing and search functions as well as an interactive web map viewer. GeoNetwork is widely used as the foundation of Spatial Data Infrastructures worldwide. !!! info "Reference" diff --git a/docs/manual/docs/help/map/index.md b/docs/manual/docs/help/map/index.md index f996b73cc55..474b3fc0a37 100644 --- a/docs/manual/docs/help/map/index.md +++ b/docs/manual/docs/help/map/index.md @@ -31,7 +31,7 @@ The map viewer has a number of features to explore the data: * Location search including searching for your current position. ![Map viewer](img/map.png) - *Mapviewer* + *Map viewer* ## Add layers diff --git a/docs/manual/docs/install-guide/installing-from-source-code.md b/docs/manual/docs/install-guide/installing-from-source-code.md index 4725640a805..8541a05ad9d 100644 --- a/docs/manual/docs/install-guide/installing-from-source-code.md +++ b/docs/manual/docs/install-guide/installing-from-source-code.md @@ -173,7 +173,7 @@ mvn jetty:run -Penv-dev After some moments of startup and initialization, GeoNetwork is available at: -For changes related to the user interface in the ``web-ui`` module or the metadata schemas in the `schemeas` module, these can be deployed in Jetty executing the following Maven command in the **web** module: +For changes related to the user interface in the ``web-ui`` module or the metadata schemas in the `schemas` module, these can be deployed in Jetty executing the following Maven command in the **web** module: ``` shell mvn process-resources -DschemasCopy=true diff --git a/docs/manual/docs/overview/about.md b/docs/manual/docs/overview/about.md index 3737502a229..967fa95ba83 100644 --- a/docs/manual/docs/overview/about.md +++ b/docs/manual/docs/overview/about.md @@ -1,6 +1,6 @@ # About -GeoNetwork-opensource is a catalog allowing visitors to search and discover spatial information. Visitors are can the included map viewer to preview datasets interactively. +GeoNetwork opensource is a catalog allowing visitors to search and discover spatial information. Visitors are can the included map viewer to preview datasets interactively. GeoNetwork provides the tools to managing spatially referenced resources including record editing. diff --git a/docs/manual/docs/overview/authors.md b/docs/manual/docs/overview/authors.md index 8cba5d77de6..1623ec8417d 100644 --- a/docs/manual/docs/overview/authors.md +++ b/docs/manual/docs/overview/authors.md @@ -8,14 +8,13 @@ In brief the committee votes on proposals on the geonetwork-dev mailinglist. Pro ### Members of the Project Steering Committee -- Emanuele Tajariol - Florent Gravin - Francois Prunayre - Jeroen Ticheler - Chair +- Jo Cook - Jose Garcia - Paul van Genuchten - Simon Pigot -- Jo Cook ### Former members of the PSC @@ -23,6 +22,7 @@ In brief the committee votes on proposals on the geonetwork-dev mailinglist. Pro - Archie Warnock - Patrizia Monteduro - Jesse Eichar +- Emanuele Tajariol ## Committers diff --git a/docs/manual/docs/overview/change-log/index.md b/docs/manual/docs/overview/change-log/index.md index 152bd21cb85..83a627c6074 100644 --- a/docs/manual/docs/overview/change-log/index.md +++ b/docs/manual/docs/overview/change-log/index.md @@ -1,6 +1,6 @@ # Change log -Notable changes made to a GeoNetwork-open source including new features, migration instructions, and bug fixes. +Notable changes made to GeoNetwork opensource including new features, migration instructions, and bug fixes. - [Latest](latest/index.md) - [Stable](stable/index.md) diff --git a/docs/manual/docs/user-guide/describing-information/deleting-metadata.md b/docs/manual/docs/user-guide/describing-information/deleting-metadata.md index b3f5ee3a16e..0839fdd02b8 100644 --- a/docs/manual/docs/user-guide/describing-information/deleting-metadata.md +++ b/docs/manual/docs/user-guide/describing-information/deleting-metadata.md @@ -1,6 +1,6 @@ # Deleting a record -User must have editing privileges to be able to remove a record. This topic describes the various ways to delete a record. +The user must have editing privileges to be able to remove a record. This topic describes the various ways to delete a record. There are different ways to remove a record: diff --git a/docs/manual/docs/user-guide/describing-information/editing-metadata.md b/docs/manual/docs/user-guide/describing-information/editing-metadata.md index e9d92133c92..c5c89b52766 100644 --- a/docs/manual/docs/user-guide/describing-information/editing-metadata.md +++ b/docs/manual/docs/user-guide/describing-information/editing-metadata.md @@ -4,7 +4,7 @@ This topic describes how to use the metadata editor. ## Using the editor toolbar -The top tool bar provides the main editor actions: +The top toolbar provides the most important functionality available to the editor: ![](img/editor-toolbar.png) @@ -12,26 +12,26 @@ From left to right: - Set metadata categories - Set metadata group -- Advanced features (eg. versioning) +- Advanced features (e.g. versioning) - `Validate` to run metadata validation - `Cancel` to cancel all changes made since the beginning of the editing session - `Save & Close` to save and close the editor -- `Save` to save the metadata or the template. The drowdown also allows to set if the edits are minor or not (ie. the change date of the metadata will not be updated if case of minor edits). +- `Save` to save the metadata or the template. The dropdown also allows to set if the edits are minor or not (i.e. the change date of the metadata will not be updated if case of minor edits). - Change view mode for the editor form, enable tooltips or switch to advanced editor mode ## Navigating the form -To describe the resource, an editor can use the form, which provides different views. By default the editor provides: +To describe the resource, an editor can use the form, which provides different views. By default, the editor provides: -- a `simple view` displaying all fields from the metadata -- a `full view` based on the metadata standard and providing access to all descriptors from the standards -- an `XML view` displaying the record as an XML document +- a `Default` view displaying all fields from the metadata +- an `Advanced` view based on the metadata standard and providing access to all descriptors from the metadata standard in use +- an `XML` view displaying the record as an XML document To switch from one view to another, use the following menu: ![](img/view-mode.png) -Once the view is selected, the editor can browse the list of fields to populate. He can also use the scroll-spy on the lower right corner to quickly access a section. +Once the view is selected, the editor can browse the list of fields to populate. He can also use the scroll-spy in the lower right corner to quickly access a section. ![](img/scoll-spy.png) diff --git a/docs/manual/docs/user-guide/describing-information/index.md b/docs/manual/docs/user-guide/describing-information/index.md index 42a2d6a620e..8808d7a1ec3 100644 --- a/docs/manual/docs/user-guide/describing-information/index.md +++ b/docs/manual/docs/user-guide/describing-information/index.md @@ -2,11 +2,11 @@ This section describes how to catalog resources. First, user needs to choose a standard to use. In general, the following rules apply: -- [Dublin core](https://dublincore.org/) usually used for opendata portal, referencing publication, report, \... +- [Dublin core](https://dublincore.org/) usually used for open data portal, referencing publication, report, \... - [ISO 19115/119/139](https://www.iso.org/iso/en/home/store/catalogue_tc/catalogue_detail.htm?csnumber=32557) used for spatial resources (eg. datasets, services, maps) - [ISO 19110](https://www.iso.org/iso/en/iso_catalogue/catalogue_tc/catalogue_detail.htm?csnumber=39965) used for feature attribute table -The editor form provides uploading of data, graphics, documents, pdf files and any other content type. It supports among other: +The editor form provides uploading of data, graphics, documents, pdf files and any other content type. It supports among others: - full standard support - multilingual metadata editing, @@ -27,4 +27,4 @@ The editor form provides uploading of data, graphics, documents, pdf files and a - [Multilingual editing](multilingual-editing.md) - [Describing resources for the INSPIRE directive](inspire-editing.md) -Based on user profiles (see [Creating user](../../administrator-guide/managing-users-and-groups/creating-user.md)), a dashboard provides easy access to their informations and tasks. +Based on user profiles (see [Creating user](../../administrator-guide/managing-users-and-groups/creating-user.md)), a dashboard provides easy access to their information and tasks. diff --git a/docs/manual/docs/user-guide/describing-information/managing-templates.md b/docs/manual/docs/user-guide/describing-information/managing-templates.md index e3c14f7c1ea..76a42857514 100644 --- a/docs/manual/docs/user-guide/describing-information/managing-templates.md +++ b/docs/manual/docs/user-guide/describing-information/managing-templates.md @@ -1,6 +1,6 @@ # Managing templates {#creating-templates} -Templates are metadata records that you can use for describing new resources. This topic describes how to load and manage templates. +Templates are metadata records that you can use as the starting point to describe new resources. This topic describes how to load and manage templates. ## Creating and managing templates diff --git a/docs/manual/mkdocs.yml b/docs/manual/mkdocs.yml index a1ce6a1cdc3..e8e5d5ef2ce 100644 --- a/docs/manual/mkdocs.yml +++ b/docs/manual/mkdocs.yml @@ -63,11 +63,11 @@ plugins: name: English build: true default: true - site_name: 'GeoNetwork Opensource (EN)' + site_name: 'GeoNetwork opensource (EN)' - locale: fr name: Français build: !ENV [FRENCH,true] - site_name: 'GeoNetwork Opensource (FR)' + site_name: 'GeoNetwork opensource (FR)' site_description: Catalogue GeoNetwork pour répertorier, rechercher et examiner les enregistrements. nav_translations: Home: Home