From: shamoon <4887959+shamoon@users.noreply.github.com>
Date: Mon, 13 Jan 2025 15:47:08 +0000 (-0800)
Subject: Merge branch 'dev'
X-Git-Tag: v2.14.0~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5821033e3d2acb1875edaf391567256140972df8;p=thirdparty%2Fpaperless-ngx.git

Merge branch 'dev'
---

5821033e3d2acb1875edaf391567256140972df8
diff --cc docs/setup.md
index 9bca5efc4c,a603440391..b7915b02b0
--- a/docs/setup.md
+++ b/docs/setup.md
@@@ -141,16 -186,21 +141,16 @@@ account. The script essentially automat
      or using docker exec from within the container:
  
      ```shell-session
-     $ python3 manage.py createsuperuser
+     python3 manage.py createsuperuser
      ```
  
 -    This will prompt you to set a username, an optional e-mail address
 -    and finally a password (at least 8 characters).
 -
 -8.  Run `docker compose up -d`. This will create and start the necessary containers.
 +    This will guide you through the superuser setup.
  
 -9.  The default `docker-compose.yml` exports the webserver on your local
 -    port
 +7.  Run `docker compose up -d`. This will create and start the necessary containers.
  
 -    8000\. If you did not change this, you should now be able to visit
 -    your Paperless instance at `http://127.0.0.1:8000` or your servers
 -    IP-Address:8000. Use the login credentials you have created with the
 -    previous step.
 +8.  Congratulations! Your Paperless-ngx instance should now be accessible at `http://127.0.0.1:8000`
 +    (or similar, depending on your configuration). Use the superuser credentials you have
 +    created in the previous step to login.
  
  ### Build the Docker image yourself {#docker_build}
  
@@@ -184,11 -234,11 +184,11 @@@
              context: .
      ```
  
 -4.  Follow steps 3 to 8 of [Docker Setup](#docker_hub). When asked to run
 -    `docker compose pull` to pull the image, do
 +4.  Follow the [Docker setup](#docker) above except when asked to run
 +    `docker compose pull` to pull the image, run
  
      ```shell-session
-     $ docker compose build
+     docker compose build
      ```
  
      instead to build the image.