Skip to content

Commit

Permalink
Merge 27a0b31 into 3cea80c
Browse files Browse the repository at this point in the history
  • Loading branch information
ntarocco committed Nov 26, 2019
2 parents 3cea80c + 27a0b31 commit 5706d9e
Show file tree
Hide file tree
Showing 13 changed files with 1,136 additions and 297 deletions.
Binary file added docs/_static/invenio-files-integration.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/_static/invenio-records-file.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
18 changes: 14 additions & 4 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -320,19 +320,29 @@

# Example configuration for intersphinx: refer to the Python standard library.
intersphinx_mapping = {
'flask': ('https://flask.readthedocs.io/', None),
'flask': ('https://flask.palletsprojects.com/en/1.1.x/', None),
'flaskassets': ('https://flask-assets.readthedocs.io/en/latest/', None),
'flaskregistry': (
'https://flask-registry.readthedocs.io/en/latest/', None),
'flaskscript': ('https://flask-script.readthedocs.io/en/latest/', None),
'invenio-access': (
'https://invenio-access.readthedocs.io/en/latest/', None),
'jinja': ('https://jinja.readthedocs.io/', None),
'invenio-celery': (
'https://invenio-celery.readthedocs.io/en/latest/', None),
'invenio-files-rest': (
'https://invenio-files-rest.readthedocs.io/en/latest/', None),
'invenio-previewer': (
'https://invenio-previewer.readthedocs.io/en/latest/', None),
'invenio-iiif': (
'https://invenio-iiif.readthedocs.io/en/latest/', None),
'invenio-records-files': (
'https://invenio-records-files.readthedocs.io/en/latest/', None),
'jinja': ('https://jinja.palletsprojects.com/en/2.10.x/', None),
'python': ('https://docs.python.org/', None),
'sqlalchemy': ('http://docs.sqlalchemy.org/en/latest/', None),
'webassets': ('https://webassets.readthedocs.io/en/latest/', None),
'werkzeug': ('https://werkzeug.readthedocs.io/', None),
'werkzeug': ('https://werkzeug.palletsprojects.com/en/0.16.x/', None),
}

# Autodoc configuraton.
# Autodoc configuration.
autoclass_content = 'both'
11 changes: 3 additions & 8 deletions docs/general/bundles.rst
Original file line number Diff line number Diff line change
Expand Up @@ -128,10 +128,9 @@ Included modules:
Files bundle
------------

The files bundle contains all modules related to management of files in
Invenio, including an object storage REST API, multiple supported storage
backends, file previewers, and IIIF image server and an integration layer
between files and records.
The files bundle contains all modules related to files management,
an object storage REST API, storage backends, file previewers,
IIIF image APIs and an integration layer between files and records.

Included modules:

Expand Down Expand Up @@ -233,10 +232,6 @@ to change prior to final release and in most cases are missing documentation.
- `invenio-query-parser <https://invenio-query-parser.readthedocs.io>`_
- Invenio v1 compatible query parser for Invenio v3. Note the module is GPL
licensed due to a GPL-licensed dependency.
- `invenio-records-editor <https://invenio-records-editor.readthedocs.io>`_
- JSON record editor.
- `invenio-records-editor-js <https://invenio-records-editor-js.readthedocs.io>`_
- Angular 4 application for editing JSON records.
- `invenio-s3 <https://invenio-s3.readthedocs.io>`_
- Support for the S3 storage protocol in Invenio.
- `invenio-saml <https://invenio-saml.readthedocs.io>`_
Expand Down
8 changes: 4 additions & 4 deletions docs/general/introduction.rst
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
..
This file is part of Invenio.
Copyright (C) 2018 CERN.
Copyright (C) 2019 CERN.
Invenio is free software; you can redistribute it and/or modify it
under the terms of the MIT License; see LICENSE file for more details.
Expand Down Expand Up @@ -55,13 +55,13 @@ Internally Invenio natively store records as JSON documents whose structure
can be validated and described with JSONSchemas. Records can easily be linked
via JSONRef providing you with powerful tools to model your records. Invenio
further comes with robust metadata transformation layer that can serialize
records to e.g. MARCXML, DataCite XML, JSON-LD, Citation Style Langauge (CSL)
records to e.g. MARCXML, DataCite XML, JSON-LD, Citation Style Language (CSL)
JSON and many other formats.

In addition Invenio provides a persistent identifier store and a resolver
that allows you to use your preferred persistent identifier scheme for
identifying records such as DOIs (Digital Object Identifiers), Handles, PURLs,
URNs or your own local identifier. The persistent identifer resolver further
URNs or your own local identifier. The persistent identifier resolver further
has support for advanced features such as tombstone pages, redirection and
merged records.

Expand All @@ -74,7 +74,7 @@ full-text search, powerful query syntax, advanced stemming and aggregations,
super-fast auto-completion suggesters as well as geospatial search.

Invenio further leverages both instant indexing as well as extremely fast
distributed bulk indexing with rates beyond 10,0000 records/second.
distributed bulk indexing with rates beyond 10,000 records/second.

File management
---------------
Expand Down
2 changes: 2 additions & 0 deletions docs/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
tutorials/build-a-repository.rst
tutorials/understanding-data-models.rst
tutorials/managing-access.rst
tutorials/handling-files.rst
tutorials/upgrade-marshmallow.rst
deployment/securing-your-instance.rst
architecture/infrastructure.rst
Expand All @@ -25,6 +26,7 @@
history.rst
releases/index.rst
community/index.rst
upgrading.rst


.. toctree::
Expand Down

0 comments on commit 5706d9e

Please sign in to comment.