From c20e982fb1f8f6befa7549c9e148410032d92d16 Mon Sep 17 00:00:00 2001 From: Sebastian Weber Date: Thu, 20 Jan 2022 00:50:41 +0100 Subject: [PATCH] Fix typos --- .github/workflows/ci.yml | 2 +- README.md | 2 +- SECURITY.md | 2 +- cookbook/forms.py | 4 ++-- cookbook/helper/permission_helper.py | 2 +- cookbook/helper/shopping_helper.py | 4 ++-- cookbook/integration/recettetek.py | 4 ++-- cookbook/management/commands/rebuildindex.py | 2 +- cookbook/models.py | 2 +- cookbook/provider/nextcloud.py | 2 +- cookbook/serializer.py | 2 +- cookbook/signals.py | 2 +- cookbook/templates/markdown_info.html | 6 +++--- cookbook/templates/search_info.html | 6 +++--- cookbook/templates/shopping_list.html | 4 ++-- cookbook/views/api.py | 2 +- cookbook/views/views.py | 2 +- docs/faq.md | 2 +- docs/features/authentication.md | 4 ++-- docs/features/external_recipes.md | 2 +- docs/index.md | 4 ++-- docs/install/kubernetes.md | 6 +++--- docs/install/manual.md | 4 ++-- docs/install/other.md | 2 +- docs/install/synology.md | 6 +++--- docs/install/traefik.md | 4 ++-- docs/install/unraid.md | 2 +- docs/system/backup.md | 2 +- docs/system/permissions.md | 4 ++-- recipes/settings.py | 2 +- vue/src/apps/ShoppingListView/ShoppingListView.vue | 2 +- vue/src/components/Badges/Shopping.vue | 2 +- vue/src/components/GenericMultiselect.vue | 2 +- vue/src/components/Modals/GenericModalForm.vue | 2 +- 34 files changed, 51 insertions(+), 51 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a844103f..fc3c578a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,4 +1,4 @@ -name: Continous Integration +name: Continuous Integration on: [push] diff --git a/README.md b/README.md index cd6442de..7af8d879 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@

The recipe manager that allows you to manage your ever growing collection of digital recipes.

- + diff --git a/SECURITY.md b/SECURITY.md index f163a7eb..e5558348 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -7,4 +7,4 @@ Since this software is still considered beta/WIP support is always only given fo ## Reporting a Vulnerability Please open a normal public issue if you have any security related concerns. If you feel like the issue should not be discussed in -public just open a generic issue and we will discuss further communitcation there (since GitHub does not allow everyone to create a security advisory :/). +public just open a generic issue and we will discuss further communication there (since GitHub does not allow everyone to create a security advisory :/). diff --git a/cookbook/forms.py b/cookbook/forms.py index 1e3ef688..60237ac7 100644 --- a/cookbook/forms.py +++ b/cookbook/forms.py @@ -442,7 +442,7 @@ class SearchPreferenceForm(forms.ModelForm): help_texts = { 'search': _( - 'Select type method of search. Click here for full desciption of choices.'), + 'Select type method of search. Click here for full description of choices.'), 'lookup': _('Use fuzzy matching on units, keywords and ingredients when editing and importing recipes.'), 'unaccent': _( 'Fields to search ignoring accents. Selecting this option can improve or degrade search quality depending on language'), @@ -461,7 +461,7 @@ class SearchPreferenceForm(forms.ModelForm): 'lookup': _('Fuzzy Lookups'), 'unaccent': _('Ignore Accent'), 'icontains': _("Partial Match"), - 'istartswith': _("Starts Wtih"), + 'istartswith': _("Starts With"), 'trigram': _("Fuzzy Search"), 'fulltext': _("Full Text") } diff --git a/cookbook/helper/permission_helper.py b/cookbook/helper/permission_helper.py index c577b56c..a826fb3f 100644 --- a/cookbook/helper/permission_helper.py +++ b/cookbook/helper/permission_helper.py @@ -34,7 +34,7 @@ def has_group_permission(user, groups): """ Tests if a given user is member of a certain group (or any higher group) Superusers always bypass permission checks. - Unauthenticated users cant be member of any group thus always return false. + Unauthenticated users can't be member of any group thus always return false. :param user: django auth user object :param groups: list or tuple of groups the user should be checked for :return: True if user is in allowed groups, false otherwise diff --git a/cookbook/helper/shopping_helper.py b/cookbook/helper/shopping_helper.py index c1a3dc1a..98bfe03f 100644 --- a/cookbook/helper/shopping_helper.py +++ b/cookbook/helper/shopping_helper.py @@ -126,7 +126,7 @@ def list_from_recipe(list_recipe=None, recipe=None, mealplan=None, servings=None add_ingredients = set(add_ingredients) - set(existing_list.values_list('ingredient__id', flat=True)) add_ingredients = Ingredient.objects.filter(id__in=add_ingredients, space=space) - # if servings have changed, update the ShoppingListRecipe and existing Entrys + # if servings have changed, update the ShoppingListRecipe and existing Entries if servings <= 0: servings = 1 @@ -138,7 +138,7 @@ def list_from_recipe(list_recipe=None, recipe=None, mealplan=None, servings=None sle.amount = sle.ingredient.amount * Decimal(servings_factor) sle.save() - # add any missing Entrys + # add any missing Entries for i in [x for x in add_ingredients if x.food]: ShoppingListEntry.objects.create( diff --git a/cookbook/integration/recettetek.py b/cookbook/integration/recettetek.py index be1c5ae0..7ae4115b 100644 --- a/cookbook/integration/recettetek.py +++ b/cookbook/integration/recettetek.py @@ -27,10 +27,10 @@ class RecetteTek(Integration): def get_recipe_from_file(self, file): - # Create initial recipe with just a title and a decription + # Create initial recipe with just a title and a description recipe = Recipe.objects.create(name=file['title'], created_by=self.request.user, internal=True, space=self.request.space, ) - # set the description as an empty string for later use for the source URL, incase there is no description text. + # set the description as an empty string for later use for the source URL, in case there is no description text. recipe.description = '' try: diff --git a/cookbook/management/commands/rebuildindex.py b/cookbook/management/commands/rebuildindex.py index 425727df..6ca4038c 100644 --- a/cookbook/management/commands/rebuildindex.py +++ b/cookbook/management/commands/rebuildindex.py @@ -15,7 +15,7 @@ class Command(BaseCommand): def handle(self, *args, **options): if settings.DATABASES['default']['ENGINE'] not in ['django.db.backends.postgresql_psycopg2', 'django.db.backends.postgresql']: - self.stdout.write(self.style.WARNING(_('Only Postgress databases use full text search, no index to rebuild'))) + self.stdout.write(self.style.WARNING(_('Only Postgresql databases use full text search, no index to rebuild'))) try: language = DICTIONARY.get(translation.get_language(), 'simple') diff --git a/cookbook/models.py b/cookbook/models.py index df6ec226..09004203 100644 --- a/cookbook/models.py +++ b/cookbook/models.py @@ -515,7 +515,7 @@ class Food(ExportModelOperationsMixin('food'), TreeModel, PermissionModelMixin): @staticmethod def reset_inheritance(space=None): - # resets inheritted fields to the space defaults and updates all inheritted fields to root object values + # resets inherited fields to the space defaults and updates all inherited fields to root object values inherit = space.food_inherit.all() # remove all inherited fields from food diff --git a/cookbook/provider/nextcloud.py b/cookbook/provider/nextcloud.py index 743ad821..b1d31919 100644 --- a/cookbook/provider/nextcloud.py +++ b/cookbook/provider/nextcloud.py @@ -33,7 +33,7 @@ class Nextcloud(Provider): try: files.pop(0) # remove first element because its the folder itself except IndexError: - pass # folder is emtpy, no recipes will be imported + pass # folder is empty, no recipes will be imported import_count = 0 for file in files: diff --git a/cookbook/serializer.py b/cookbook/serializer.py index a020bec7..c0543efe 100644 --- a/cookbook/serializer.py +++ b/cookbook/serializer.py @@ -865,7 +865,7 @@ class AutomationSerializer(serializers.ModelSerializer): # CORS, REST and Scopes aren't currently working -# Scopes are evaluating before REST has authenticated the user assiging a None space +# Scopes are evaluating before REST has authenticated the user assigning a None space # I've made the change below to fix the bookmarklet, other serializers likely need a similar/better fix class BookmarkletImportSerializer(serializers.ModelSerializer): def create(self, validated_data): diff --git a/cookbook/signals.py b/cookbook/signals.py index c21d6638..d763b897 100644 --- a/cookbook/signals.py +++ b/cookbook/signals.py @@ -72,7 +72,7 @@ def update_food_inheritance(sender, instance=None, created=False, **kwargs): return inherit = inherit.values_list('field', flat=True) - # apply changes from parent to instance for each inheritted field + # apply changes from parent to instance for each inherited field if instance.parent and inherit.count() > 0: parent = instance.get_parent() if 'ignore_shopping' in inherit: diff --git a/cookbook/templates/markdown_info.html b/cookbook/templates/markdown_info.html index d3d51d80..853fe14f 100644 --- a/cookbook/templates/markdown_info.html +++ b/cookbook/templates/markdown_info.html @@ -54,7 +54,7 @@

{% trans 'Formatting' %}


         {% trans 'Line breaks are inserted by adding two spaces after the end of a line' %}
-        {% trans 'or by leaving a blank line inbetween.' %}
+        {% trans 'or by leaving a blank line in between.' %}
 
         **{% trans 'This text is bold' %}**
         *{% trans 'This text is italic' %}*
@@ -70,7 +70,7 @@
     

         

             {% trans 'Line breaks are inserted by adding two spaces after the end of a line' %}

-            {% trans 'or by leaving a blank line inbetween.' %}


+            {% trans 'or by leaving a blank line in between.' %}


             {% trans 'This text is bold' %}

             {% trans 'This text is italic' %}
             

@@ -82,7 +82,7 @@
 
     

     
{% trans 'Lists' %}

-    {% trans 'Lists can ordered or unorderd. It is important to leave a blank line before the list!' %}
+    {% trans 'Lists can ordered or unordered. It is important to leave a blank line before the list!' %}
     

         {% trans 'Ordered List' %}
 
diff --git a/cookbook/templates/search_info.html b/cookbook/templates/search_info.html
index 6f267a58..262b0428 100644
--- a/cookbook/templates/search_info.html
+++ b/cookbook/templates/search_info.html
@@ -27,7 +27,7 @@
             {% endblocktrans %}

             
{% trans 'Simple' %}

             
 {% blocktrans %} 
-            Simple searches ignore punctuation and common words such as 'the', 'a', 'and'. And will treat seperate words as required.
+            Simple searches ignore punctuation and common words such as 'the', 'a', 'and'. And will treat separate words as required.
             Searching for 'apple or flour' will return any recipe that includes both 'apple' and 'flour' anywhere in the fields that have been selected for a full text search.
             {% endblocktrans %}

             
{% trans 'Phrase' %}

@@ -39,7 +39,7 @@
             
 {% blocktrans %} 
             Web searches simulate functionality found on many web search sites supporting special syntax.
             Placing quotes around several words will convert those words into a phrase.
-            'or' is recongized as searching for the word (or phrase) immediately before 'or' OR the word (or phrase) directly after.
+            'or' is recognized as searching for the word (or phrase) immediately before 'or' OR the word (or phrase) directly after.
             '-' is recognized as searching for recipes that do not include the word (or phrase) that comes immediately after. 
             For example searching for 'apple pie' or cherry -butter will return any recipe that includes the phrase 'apple pie' or the word 'cherry' 
             in any field included in the full text search but exclude any recipe that has the word 'butter' in any field included.
@@ -59,7 +59,7 @@
             {% blocktrans %} 
             Another approach to searching that also requires Postgresql is fuzzy search or trigram similarity. A trigram is a group of three consecutive characters.
             For example searching for 'apple' will create x trigrams 'app', 'ppl', 'ple' and will create a score of how closely words match the generated trigrams.
-            One benefit of searching trigams is that a search for 'sandwich' will find mispelled words such as 'sandwhich' that would be missed by other methods.
+            One benefit of searching trigams is that a search for 'sandwich' will find misspelled words such as 'sandwhich' that would be missed by other methods.
             {% endblocktrans %} 
         

 
diff --git a/cookbook/templates/shopping_list.html b/cookbook/templates/shopping_list.html
index dcc4ba53..cfb2cb7f 100644
--- a/cookbook/templates/shopping_list.html
+++ b/cookbook/templates/shopping_list.html
@@ -263,7 +263,7 @@
         {% if request.user.userpreference.shopping_auto_sync > 0 %}
         

             

-                
+                
             

         

         {% endif %}
@@ -634,7 +634,7 @@
                         console.log('updating recipe', this.shopping_list.recipes[i])
                         recipe_promises.push(this.$http.post("{% url 'api:shoppinglistrecipe-list' %}", this.shopping_list.recipes[i], {}).then((response) => {
                             let old_id = this.shopping_list.recipes[i].id
-                            console.log("list recipe create respose ", response.body)
+                            console.log("list recipe create response ", response.body)
                             this.$set(this.shopping_list.recipes, i, response.body)
                             for (let e of this.shopping_list.entries.filter(item => item.list_recipe === old_id)) {
                                 console.log("found recipe updating ID")
diff --git a/cookbook/views/api.py b/cookbook/views/api.py
index 5726bbae..1d514056 100644
--- a/cookbook/views/api.py
+++ b/cookbook/views/api.py
@@ -1088,7 +1088,7 @@ def recipe_from_source(request):
             return JsonResponse(
                 {
                     'error': True,
-                    'msg': _('No useable data could be found.')
+                    'msg': _('No usable data could be found.')
                 },
                 status=400
             )
diff --git a/cookbook/views/views.py b/cookbook/views/views.py
index c40dce37..088d18bb 100644
--- a/cookbook/views/views.py
+++ b/cookbook/views/views.py
@@ -411,7 +411,7 @@ def user_settings(request):
     if (api_token := Token.objects.filter(user=request.user).first()) is None:
         api_token = Token.objects.create(user=request.user)
 
-    # these fields require postgress - just disable them if postgress isn't available
+    # these fields require postgresql - just disable them if postgresql isn't available
     if not settings.DATABASES['default']['ENGINE'] in ['django.db.backends.postgresql_psycopg2',
                                                        'django.db.backends.postgresql']:
         search_form.fields['search'].disabled = True
diff --git a/docs/faq.md b/docs/faq.md
index 768f19fa..a9b0bdc5 100644
--- a/docs/faq.md
+++ b/docs/faq.md
@@ -51,7 +51,7 @@ In technical terms it is a multi tenant system.
 You can compare a space to something like google drive or dropbox. 
 There is only one installation of the Dropbox system, but it handles multiple users without them noticing each other.
 For Tandoor that means all people that work together on one recipe collection can be in one space. 
-If you want to host the collection of your friends family or your neighbor you can create a separate space for them (trough the admin interface).
+If you want to host the collection of your friends family or your neighbor you can create a separate space for them (through the admin interface).
 
 Sharing between spaces is currently not possible but is planned for future releases.
 
diff --git a/docs/features/authentication.md b/docs/features/authentication.md
index 0f611488..abdd6660 100644
--- a/docs/features/authentication.md
+++ b/docs/features/authentication.md
@@ -25,8 +25,8 @@ SOCIAL_PROVIDERS=allauth.socialaccount.providers.github,allauth.socialaccount.pr
     The exact formatting is important so make sure to follow the steps explained here!
 
 Depending on your authentication provider you **might need** to configure it. 
-This needs to be done trough the settings system. To make the system flexible (allow multiple providers) and to 
-not require another file to be mounted into the container the configuration ins done trough a single
+This needs to be done through the settings system. To make the system flexible (allow multiple providers) and to 
+not require another file to be mounted into the container the configuration ins done through a single
 environment variable. The downside of this approach is that the configuration needs to be put into a single line
 as environment files loaded by docker compose don't support multiple lines for a single variable.
 
diff --git a/docs/features/external_recipes.md b/docs/features/external_recipes.md
index 325f509d..29a0be42 100644
--- a/docs/features/external_recipes.md
+++ b/docs/features/external_recipes.md
@@ -35,7 +35,7 @@ The basic configuration is the same for all providers.
 ### Local
 
 !!! info
-    There is currently no way to upload files trough the webinterface. This is a feature that might be added later.
+    There is currently no way to upload files through the webinterface. This is a feature that might be added later.
 
 The local provider does not need any configuration.
 For the monitor you will need to define a valid path on your host system. 
diff --git a/docs/index.md b/docs/index.md
index e4e1bfb2..4a44fa27 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -9,7 +9,7 @@
 
The recipe manager that allows you to manage your ever growing collection of digital recipes.

 
 

-
+
 
 
 
@@ -85,7 +85,7 @@ there are some greater overall goals for the future (in no particular order)
 
 - Improve the UI! The Design is inconsistent and many pages work but don't look great. This needs to change.
 - I strongly believe in Open Data and Systems. Thus adding importers and exporters for all relevant other recipe management systems is something i really want to do.
-- Move all Javascript Libraries to a packet manger and clean up some of the mess I made in the early days
+- Move all Javascript Libraries to a packet manager and clean up some of the mess I made in the early days
 - Improve Test coverage and also the individual tests themselves
 - Improve the documentation for all features and aspects of this project and add some application integrated help
 
diff --git a/docs/install/kubernetes.md b/docs/install/kubernetes.md
index 992be89c..ffd21e49 100644
--- a/docs/install/kubernetes.md
+++ b/docs/install/kubernetes.md
@@ -2,7 +2,7 @@
 
 # K8s Setup
 
-This is a setup which should be sufficent for production use. Be sure to replace the default secrets!
+This is a setup which should be sufficient for production use. Be sure to replace the default secrets!
 
 # Files
 
@@ -45,7 +45,7 @@ The creation of the persistent volume claims for media and static content. May y
 
 ## 40-sts-postgresql.yaml
 
-The PostgreSQL stateful set, based on a bitnami image. It runs a init container as root to do the preparations. The postgres container itsef runs as a lower privileged user. The recipes app uses the database super user (postgres) as the recipies app is doing some db migrations on startup, which needs super user privileges.
+The PostgreSQL stateful set, based on a bitnami image. It runs a init container as root to do the preparations. The postgres container itself runs as a lower privileged user. The recipes app uses the database super user (postgres) as the recipes app is doing some db migrations on startup, which needs super user privileges.
 
 ## 45-service-db.yaml
 
@@ -53,7 +53,7 @@ Creating the database service.
 
 ## 50-deployment.yaml
 
-The deployment first fires up a init container to do the database migrations and file modifications. This init container runs as root. The init conainer runs part of the [boot.sh](https://github.com/TandoorRecipes/recipes/blob/develop/boot.sh) script from the `vabene1111/recipes` image. 
+The deployment first fires up a init container to do the database migrations and file modifications. This init container runs as root. The init container runs part of the [boot.sh](https://github.com/TandoorRecipes/recipes/blob/develop/boot.sh) script from the `vabene1111/recipes` image. 
 
 The deployment then runs two containers, the recipes-nginx and the recipes container which runs the gunicorn app. The nginx container gets it's nginx.conf via config map to deliver static content `/static` and `/media`. The guincorn container gets it's secret key and the database password from the secret `recipes`. `gunicorn` runs as user `nobody`.
 
diff --git a/docs/install/manual.md b/docs/install/manual.md
index 44f026c5..313ee684 100644
--- a/docs/install/manual.md
+++ b/docs/install/manual.md
@@ -1,6 +1,6 @@
 # Manual installation instructions
 
-These intructions are inspired from a standard django/gunicorn/postgresql instructions ([for example](https://www.digitalocean.com/community/tutorials/how-to-set-up-django-with-postgres-nginx-and-gunicorn-on-ubuntu-16-04))
+These instructions are inspired from a standard django/gunicorn/postgresql instructions ([for example](https://www.digitalocean.com/community/tutorials/how-to-set-up-django-with-postgres-nginx-and-gunicorn-on-ubuntu-16-04))
 
 !!! warning
     Be sure to use python 3.9 and pip related to python 3.9. Depending on your distribution calling `python` or `pip` will use python2 instead of python 3.9.
@@ -115,7 +115,7 @@ ExecStart=/var/www/recipes/bin/gunicorn --error-logfile /tmp/gunicorn_err.log --
 WantedBy=multi-user.target
 ```
 
-*Note*: `-error-logfile /tmp/gunicorn_err.log --log-level debug --capture-output` are usefull for debugging and can be removed later
+*Note*: `-error-logfile /tmp/gunicorn_err.log --log-level debug --capture-output` are useful for debugging and can be removed later
 
 *Note2*: Fix the path in the `ExecStart` line to where you gunicorn and recipes are
 
diff --git a/docs/install/other.md b/docs/install/other.md
index 4b42eb09..a060b057 100644
--- a/docs/install/other.md
+++ b/docs/install/other.md
@@ -57,4 +57,4 @@ apache:
 
 I used two paths `` and `` for simplicity. In my case I have ` = recipes` and ` = serve/recipes`. One could also change the matching rules of traefik to have everything under one path.
 
-I left out the TLS config in this example for simplicty.
+I left out the TLS config in this example for simplicity.
diff --git a/docs/install/synology.md b/docs/install/synology.md
index 5fccc43e..c9e6be60 100644
--- a/docs/install/synology.md
+++ b/docs/install/synology.md
@@ -78,7 +78,7 @@ Easiest way is to do it via Reverse Proxy
 	- insert name
 	- Source:
 		- Protocol: HTTPS
-		- Hostname: URL if you acces from outside, otherwise ip in network
+		- Hostname: URL if you access from outside, otherwise ip in network
 		- Port: The port you want to access, has to be a different one that the one in the docker-compose file
 		- HSTS can be enabled
 	- Destination:
@@ -88,14 +88,14 @@ Easiest way is to do it via Reverse Proxy
 	- Click on Custom Header and press Create -> Websocket
 	- Save
 - Control Panel -> Security -> Firewall -> Edit Rules -> Create
-	- Ports: Select form a list of build-in applications -> Select -> You find your Reverse Proxy, enable it
+	- Ports: Select form a list of built-in applications -> Select -> You find your Reverse Proxy, enable it
 	- Source IP: Depends, All allows access from outside, i use specific to only connect in my network
 	- Action: Allow
 - Save and make sure it's above the deny rules
 
 [Deprecated, Note: ssl Path changed for DSM 7]
 6.1 Additional SSL Setup 
-- create foler `ssl` inside `nginx` folder
+- create folder `ssl` inside `nginx` folder
 	- download your ssl certificate from `security` tab in dsm `control panel`
 	- or create a task in `task manager` because Synology will update the certificate every few months
 		- set task to repeat every day
diff --git a/docs/install/traefik.md b/docs/install/traefik.md
index 6e773b57..e049b3d3 100644
--- a/docs/install/traefik.md
+++ b/docs/install/traefik.md
@@ -1,6 +1,6 @@
 !!! danger
-    Please refer to [the offical documentation](https://doc.traefik.io/traefik/).
-    This example just shows something similar to my setup in case you dont understand the offical documentation.
+    Please refer to [the official documentation](https://doc.traefik.io/traefik/).
+    This example just shows something similar to my setup in case you dont understand the official documentation.
 
 You need to create a network called `traefik` using `docker network create traefik`.
 ## docker-compose.yml
diff --git a/docs/install/unraid.md b/docs/install/unraid.md
index 3babcdc6..ef533414 100644
--- a/docs/install/unraid.md
+++ b/docs/install/unraid.md
@@ -18,7 +18,7 @@ After that, you can go to the "Apps" tab in unRAID and search for Recipes and lo
 ![image](https://user-images.githubusercontent.com/724777/111038251-faa0cb00-83f5-11eb-9807-37815de8d795.png)
 
 The default settings should by fine for most users, just be sure to enter a secret key that is randomly generated.
-Then chooose apply.
+Then choose apply.
 
 ![image](https://user-images.githubusercontent.com/724777/97094856-f3377b80-1626-11eb-98d5-e4b871a420f0.png)
 
diff --git a/docs/system/backup.md b/docs/system/backup.md
index 80af942a..b265eeb9 100644
--- a/docs/system/backup.md
+++ b/docs/system/backup.md
@@ -2,7 +2,7 @@ There is currently no "good" way of backing up your data implemented in the appl
 This mean that you will be responsible for backing up your data.
 
 It is planned to add a "real" backup feature similar to applications like homeassistant where a snapshot can be
-downloaded and restored trough the web interface.
+downloaded and restored through the web interface.
 
 !!! warning
     When developing a new backup strategy, make sure to also test the restore process!
diff --git a/docs/system/permissions.md b/docs/system/permissions.md
index bdf34073..3c3374a5 100644
--- a/docs/system/permissions.md
+++ b/docs/system/permissions.md
@@ -21,13 +21,13 @@ The following table roughly defines the capabilities of each role
 !!! warning
     Users without groups cannot do anything. Make sure to assign them a group!
 
-You can either create new users trough the admin interface or by sending them invite links.
+You can either create new users through the admin interface or by sending them invite links.
 
 Invite links can be generated on the System page. If you specify a username during the creation of the link 
 the person using it won't be able to change that name.
 
 ## Managing Permissions
-Management of permissions can currently only be achieved trough the django admin interface.
+Management of permissions can currently only be achieved through the django admin interface.
 
 !!! warning
     Please do not rename the groups as this breaks the permission system.
diff --git a/recipes/settings.py b/recipes/settings.py
index e5283271..a4e07133 100644
--- a/recipes/settings.py
+++ b/recipes/settings.py
@@ -407,7 +407,7 @@ TEST_RUNNER = "cookbook.helper.CustomTestRunner.CustomTestRunner"
 # settings for cross site origin (CORS)
 # all origins allowed to support bookmarklet
 # all of this may or may not work with nginx or other web servers
-# TODO make this user configureable - enable or disable bookmarklets
+# TODO make this user configurable - enable or disable bookmarklets
 # TODO since token auth is enabled - this all should be https by default
 CORS_ORIGIN_ALLOW_ALL = True
 
diff --git a/vue/src/apps/ShoppingListView/ShoppingListView.vue b/vue/src/apps/ShoppingListView/ShoppingListView.vue
index 016479f7..8a7d31aa 100644
--- a/vue/src/apps/ShoppingListView/ShoppingListView.vue
+++ b/vue/src/apps/ShoppingListView/ShoppingListView.vue
@@ -1152,7 +1152,7 @@ export default {
     updateFood: function (food, field) {
       let api = new ApiApiFactory()
       if (field) {
-        // assume if field is changing it should no longer be inheritted
+        // assume if field is changing it should no longer be inherited
         food.inherit_fields = food.inherit_fields.filter((x) => x.field !== field)
       }
 
diff --git a/vue/src/components/Badges/Shopping.vue b/vue/src/components/Badges/Shopping.vue
index 57bb4d82..e2db01f6 100644
--- a/vue/src/components/Badges/Shopping.vue
+++ b/vue/src/components/Badges/Shopping.vue
@@ -59,7 +59,7 @@ export default {
         addShopping() {
             if (this.shopping) {
                 return
-            } // if item already in shopping list, excution handled after confirmation
+            } // if item already in shopping list, execution handled after confirmation
             let params = {
                 id: this.item.id,
                 amount: 1,
diff --git a/vue/src/components/GenericMultiselect.vue b/vue/src/components/GenericMultiselect.vue
index 7e11467e..2fe6e68f 100644
--- a/vue/src/components/GenericMultiselect.vue
+++ b/vue/src/components/GenericMultiselect.vue
@@ -116,7 +116,7 @@ export default {
         },
         addNew(e) {
             this.$emit("new", e)
-            // could refactor as Promise - seems unecessary
+            // could refactor as Promise - seems unnecessary
             setTimeout(() => {
                 this.search("")
             }, 750)
diff --git a/vue/src/components/Modals/GenericModalForm.vue b/vue/src/components/Modals/GenericModalForm.vue
index 15b1b536..6a0981a6 100644
--- a/vue/src/components/Modals/GenericModalForm.vue
+++ b/vue/src/components/Modals/GenericModalForm.vue
@@ -77,7 +77,7 @@ export default {
     },
     mounted() {
         this.id = Math.random()
-        this.$root.$on("change", this.storeValue) // boostrap modal placed at document so have to listen at root of component
+        this.$root.$on("change", this.storeValue) // bootstrap modal placed at document so have to listen at root of component
     },
     computed: {
         buttonLabel() {