From 2147af0e6a8ec6deba0ce1423bc34bfe60b9175b Mon Sep 17 00:00:00 2001
From: Storm Heg <storm@stormheg.co>
Date: Sat, 26 Mar 2022 22:34:50 +0100
Subject: [PATCH 1/5] Fix typo in api.rst

---
 docs/api.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/api.rst b/docs/api.rst
index 1d5b3f1b2..7cbf08718 100644
--- a/docs/api.rst
+++ b/docs/api.rst
@@ -60,7 +60,7 @@ The endpoints correctly serve the response header fields ``Content-Disposition``
 and ``Content-Type`` to indicate the filename for download and the type of content of
 the document.
 
-In order to download or preview the original document when an archied document is available,
+In order to download or preview the original document when an archived document is available,
 supply the query parameter ``original=true``.
 
 .. hint::

From c43193b17d17de78bfa040299fc6477afa1107b5 Mon Sep 17 00:00:00 2001
From: shamoon <4887959+shamoon@users.noreply.github.com>
Date: Wed, 30 Mar 2022 00:03:48 -0700
Subject: [PATCH 2/5] Add note for target branch

[ci skip]
---
 .github/PULL_REQUEST_TEMPLATE.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 617233ec2..532626ea5 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,3 +1,7 @@
+<!-- 
+Note: All PRs with code changes should be targeted to the `dev` branch, pure documentation changes can target `main`
+-->
+
 ## Proposed change
 
 <!--

From be2b59431f976deac8df9f71ea8f1c340f815da8 Mon Sep 17 00:00:00 2001
From: Alexey Zinchenko <Prominence@users.noreply.github.com>
Date: Wed, 30 Mar 2022 13:27:09 +0300
Subject: [PATCH 3/5] Update troubleshooting.rst

---
 docs/troubleshooting.rst | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/docs/troubleshooting.rst b/docs/troubleshooting.rst
index f56d2cd09..3ae4909de 100644
--- a/docs/troubleshooting.rst
+++ b/docs/troubleshooting.rst
@@ -25,6 +25,19 @@ Check for the following issues:
 *   Go to the admin interface, and check if there are failed tasks. If so, the
     tasks will contain an error message.
 
+Consumer warns ``OCR for XX failed``
+####################################
+
+If you find the OCR accuracy to be too low, and/or the document consumer warns
+that ``OCR for XX failed, but we're going to stick with what we've got since
+FORGIVING_OCR is enabled``, then you might need to install the
+`Tesseract language files <http://packages.ubuntu.com/search?keywords=tesseract-ocr>`_
+marching your document's languages.
+
+As an example, if you are running Paperless-ngx from any Ubuntu or Debian
+box, and your documents are written in Spanish you may need to run::
+
+    apt-get install -y tesseract-ocr-spa
 
 Consumer fails to pickup any new files
 ######################################

From 70bc70ec97d0ac48670cb5c1954ba415166d592e Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+shamoon@users.noreply.github.com>
Date: Wed, 30 Mar 2022 09:54:43 -0700
Subject: [PATCH 4/5] Add frontend tests to docs

---
 docs/extending.rst | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/docs/extending.rst b/docs/extending.rst
index a9e6ebf94..ae855e370 100644
--- a/docs/extending.rst
+++ b/docs/extending.rst
@@ -34,6 +34,8 @@ it fixed for everyone!
 Before contributing please review our `code of conduct`_ and other important
 information in the `contributing guidelines`_.
 
+.. _code-formatting-with-pre-commit-hooks:
+
 Code formatting with pre-commit Hooks
 =====================================
 
@@ -183,6 +185,31 @@ X-Frame-Options are in place so that the front end behaves exactly as in product
 relies on you being logged into the back end. Without a valid session, The front end will simply
 not work.
 
+Testing and code style:
+
+*   The frontend code (.ts, .html, .scss) use ``prettier`` for code formatting via the Git
+    ``pre-commit`` hooks which run automatically on commit. See
+    :ref:`above <code-formatting-with-pre-commit-hooks>` for installation. You can also run this
+    via cli with a command such as
+
+    .. code:: shell-session
+
+        $ git ls-files -- '*.ts' | xargs pre-commit run prettier --files
+
+*   Frontend testing uses jest and cypress. There is currently a need for significantly more
+    frontend tests. Unit tests and e2e tests, respectively, can be run non-interactively with:
+
+    .. code:: shell-session
+
+        $ ng test
+        $ npm run e2e:ci
+
+    Cypress also includes a UI which can be run from within the ``src-ui`` directory with
+
+    .. code:: shell-session
+
+        $ ./node_modules/.bin/cypress open
+
 In order to build the front end and serve it as part of django, execute
 
 .. code:: shell-session

From cb8fd6597d953cb35fbac528f160aa8b87ff6aed Mon Sep 17 00:00:00 2001
From: Michael Shamoon <4887959+shamoon@users.noreply.github.com>
Date: Thu, 31 Mar 2022 15:42:46 -0700
Subject: [PATCH 5/5] Merge changes from #583 from @fantasticle

https://github.com/paperless-ngx/paperless-ngx/pull/583/commits/5496412aecaa07a2bfcf726b9c8a526fe1f95581
---
 docs/extending.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/extending.rst b/docs/extending.rst
index ae855e370..8b276dacc 100644
--- a/docs/extending.rst
+++ b/docs/extending.rst
@@ -87,6 +87,7 @@ To do the setup you need to perform the steps from the following chapters in a c
             docker run -d -p 6379:6379 --restart unless-stopped redis:latest
 
 7.  Install the python dependencies by performing in the src/ directory.
+
     .. code:: shell-session
 
         pipenv install --dev