Merge remote-tracking branch 'origin/current-docs'

website/elm/GetStarted.elm

@@ -27,11 +27,6 @@ getStarted version =
    ```bash
    $ docker-compose up -d
    ```
-
-   The environment variable defines a secret that is shared between
-   some containers. You can define whatever you like. Please see the
-   [`consumedir.sh`](doc/tools/consumedir#docker) docs for additional
-   info.
 4. Goto <http://localhost:7880>, signup and login. When signing up,
    choose the same name for collective and user. Then login
    with this name and the password.
@@ -40,8 +35,8 @@ getStarted version =
    chose for the collective at registration) and place files in there
    for importing them.
 
-The directory contains a file `docspell.conf` that you can
-[modify](docs/configure) as needed.
+The `docker-compose.yml` file defines some environment variables to
+configure docspell. You can [modify](docs/configure) them as needed.
     """
         ]
     , div [ class "content container" ]

website/site/content/docs/features/_index.md

@@ -91,4 +91,4 @@ considering docspell at the moment.
 
 - Documents cannot be modified.
 - You can remove and add documents but there is no versioning.
-- There are no user/groups nor permission management
+- There is no fine grained permission management

website/site/content/docs/webapp/metadata.md

@@ -135,8 +135,7 @@ language can also specified with each [upload
 request](@/docs/api/upload.md).
 
 Go to the *Collective Settings* page and click *Document
-Language*. This will set the lanugage for all your documents. It is
-not (yet) possible to specify it when uploading.
+Language*. This will set the lanugage for all your documents.
 
 The language has effects in several areas: text extraction, fulltext
 search and text analysis. When extracting text from images, tesseract