Merge branch 'develop' into joost

markdown/dev/tutorials/en.md

@@ -6,7 +6,7 @@ order: zaa
 You can find a list of all FreeSewing tutorials below:
 
 ## Main sections
-<ReadMore  />
+<ReadMore />
 
 <Related>
 

markdown/dev/tutorials/getting-started-linux/dev-setup/en.md

@@ -95,6 +95,21 @@ yarn kickstart
 
 Now you're ready to [start the development environment](/tutorials/getting-started-linux/dev-start).
 
+<Note>
+
+There is another `yarn` command that comes with some Linux distributions,
+installed as part of the `cmdtest` package and used for command line
+scenario testing.
+If you get an `ERROR: There are no scenarios; must have at least one.`
+message when trying to run the `yarn` command, it may be because the wrong
+`yarn` is being used.
+
+Possible workarounds for this include uninstalling the `cmdtest` package
+or making sure that npm `yarn` is installed and comes first in your `PATH`
+environment variable.
+
+</Note>
+
 ## Creating a new design
 
 If you would like to create a new design, run the following command:

markdown/dev/tutorials/getting-started-vercel/en.md

@@ -49,11 +49,11 @@ Within each repository there can be multiple projects.
 
 _Projects_ are specific build types for the repository.
 For example, one project in your FreeSewing repository could
-be the one that builds the lab.freesewing.dev website.
+be the one that builds the freesewing.org website.
 You would use this project to test new designs or changes
 to existing designs.
-Another project could be the one that builds the freesewing.org
-website, used to test changes to that website.
+Another project could be the one that builds the freesewing.dev
+website, used to test documentation changes on that website.
 
 <Tip compact>
 Free Hobby accounts are limited to 3 Projects per Git repository.
@@ -71,8 +71,8 @@ you make to every branch in your repository.
 The reason why Vercel builds these deployments automatically is so you
 will always have the latest version available to test without
 having to think about it or do any additional work.
-The reason why Vercel builds a deployment for every push and update
-is so you have the ability to easily test different versions, past
+And, because deployments are built for every push and update,
+you have the ability to easily test different versions, past
 and current.
 This ability can help you identify what code change might have introduced
 an issue or change in behavior.
@@ -122,7 +122,7 @@ However, you should instead import your own personal fork of the
 FreeSewing repository.
 
 1. In the dropdown menu, select "Add a GitHub Account".
-2. Select your personal GitHub acccount from the list.
+2. Select your personal GitHub account from the list.
 3. Select the "Only select repositories" radio button.
 4. In "Select repositories" drop-down menu, select your `freesewing`
 repository.
@@ -141,7 +141,6 @@ By default, the default Root Directory will be `sites/dev`.
 The Root Directory setting will determine the build type for the project.
 - `sites/dev` will build a freesewing.dev website
 - `sites/org` will build a freesewing.org website
-- `sites/lab` will build a lab.freesewing.dev website/app
 
 1. Change the name of the project, if you wish.
 Names can consist of alphanumeric lowercase and hyphen characters.
@@ -153,7 +152,7 @@ add `yarn build` as the Build Command override.
 
 Vercel will then create the project and start building the project's first
 deployment based on the current `develop` branch.
-Once the build completes (in about 3-4 minutes or so)
+Once the build completes
 you will see a Congratulations page, with a preview image of the
 website home page.
 
@@ -181,13 +180,16 @@ when you push to GitHub
 when you push to GitHub
 
 If you have multiple projects for the same repository
-(for example, if you have both `sites/lab` and `sites/dev` projects),i
-then multiple deployments will be created everytime you push to GitHub.
+(for example, if you have both `sites/org` and `sites/dev` projects),
+then multiple deployments will be created every time you push to GitHub.
 
 Deployments are automatically created by Vercel.
 However, because free Hobby accounts are limited to 1 concurrent
 build, new deployments might be queued before they start building.
-Once they start, deployments take 3-4 minutes or so to build.
+
+Once they start, deployments take about
+4-5 minutes to build for `/sites/dev` and
+16-18 minutes or so for `sites/org`.
 
 ## The Vercel Dashboard
 
@@ -209,6 +211,8 @@ deployments for that project.
 Click on the __Deployments__ tab to see all of the project's deployments.
 Click on a deployment name to go to its deployment page.
 
+Click on the __Settings__ tab to see the project's settings.
+
 ## Deployment pages
 
 On the default __Deployment__ tab at the top of the deployment page
@@ -224,11 +228,11 @@ commit.
 of that branch.
 
 If you ever want to delete a deployment you can do so on its
-deployment page, under the __...__ three dots menu.
+deployment page, under the "__...__" three dots menu.
 
 ## Usage and Billing
 
-Verce's free Hobby accounts come with
+Vercel's free Hobby accounts come with
 100 GB of bandwidth and 100 hours of build time each month.
 This should be at least 10-15x the amount you will actually use in
 a month, so do not worry about this.
@@ -239,5 +243,15 @@ top of the Dashboard page.
 - Or, [https://vercel.com/account/billing][vb] will show a summary
 of your usage.
 
+## Disabling automatic deployments
+
+You can disable and enable automatic deployments for a project,
+for example if you wish to temporarily stop them while working on
+a bug that prevents successful builds.
+
+On the Project Settings page, select __Git__ from the menu on the
+left.  Change the __Ignored Build Step__ behavior from "Automatic" to
+"Don't build anything".
+
 [vu]: https://vercel.com/dashboard/usage
 [vb]: https://vercel.com/account/billing

markdown/dev/tutorials/pattern-design/part1/nodejs/en.md

@@ -9,7 +9,7 @@ precise. You can switch this website theme from light to dark mode, and
 that would not work without JavaScript.
 
 As a **user** of FreeSewing, this is all you need. To develop with FreeSewing
-you are going to need to be able to run JavaScript *outside* the browswer using
+you are going to need to be able to run JavaScript *outside* the browser using
 a JavaScript *runtime*. Which just means a thing that can *run* JavaScript.
 
 We are going to be using [NodeJS](https://nodejs.org/) in this tutorial. It is

markdown/dev/tutorials/pattern-design/part1/sde/en.md

@@ -24,11 +24,11 @@ From left to right you can see:
 
 ## Design templates
 
-If you click he **Design** icon it will show this menu:
+If you click the **Design** icon it will show this menu:
 
 ![Design templates provided by the FreeSewing development environment](./templates.png)
 
-It allows you to choose a desing template to start from. The following templates are included:
+It allows you to choose a design template to start from. The following templates are included:
 
 - **From scratch**: Start with an (almost) empty design
 - **Tutorial**: Start with the end result of this very tutorial
@@ -41,7 +41,7 @@ It allows you to choose a desing template to start from. The following templates
 For the following along this tutorial, you have two options:
 
 - Pick **Tutorial** if you prefer to read along, make small changes, and see how they affect the design.
-- Pick **From scratch** if you prefer to actively participate be recreating the desing in this tutorial.
+- Pick **From scratch** if you prefer to actively participate by recreating the design in this tutorial.
 
-I recommend the latter. You will learn (and remember) a lot more if you are activele engaging.
+I recommend the latter. You will learn (and remember) a lot more if you are actively engaging.
 

markdown/dev/tutorials/pattern-design/part1/structure/en.md

@@ -4,9 +4,9 @@ order: 40
 ---
 
 Inside the `freesewing` folder -- which might have a different name if that is
-the choice you made -- you will find a bunch of files and folders.  
+the choice you made -- you will find a bunch of files and folders.
 
-The one that matter is the `design` folder. In it, you will find the followin
+The one that matter is the `design` folder. In it, you will find the following
 subfolders:
 
 - `from-bella`

markdown/dev/tutorials/pattern-design/part2/adding-measurements/en.md

@@ -21,7 +21,7 @@ So let's add it as a required measurement.
 In our `src/bib.mjs` file, we will add a `measurements` property to the `bib` object.
 This property will be an Array (a list) holding all required measurements for this part.
 
-I am usign [*the official name* of the measurement](/reference/measurements) here. For head
+I am using [*the official name* of the measurement](/reference/measurements) here. For head
 circumference, that name is `head`.
 
 ```src/bib.mjs

markdown/dev/tutorials/pattern-design/part2/adding-options/en.md

@@ -49,7 +49,7 @@ Can you guess what it means?
 
 - We've added the `options` property to our `bib` object
 - On the `options` property, we have added `neckRatio` which holds the configuration for our option
-- It is a `pct` option -- whcih means it's a percentage
+- It is a `pct` option -- which means it's a percentage
 - Its default value is 90%
 - Its minimum value is 70%
 - Its maximum value is 90%

markdown/dev/tutorials/pattern-design/part2/avoiding-overlap/en.md

@@ -13,7 +13,7 @@ to rotate.
 
 However, there is a catch. 
 
-## Macros and auto-gerenated IDs
+## Macros and auto-generated IDs
 We have used the `round` macro to help us round the corners
 of our strap, and it added a bunch of auto-generated points to our pattern. We need to
 rotate these points too, but what are their names?

markdown/dev/tutorials/pattern-design/part2/conclusion/en.md

@@ -12,7 +12,7 @@ including some more advanced things like rotating a bunch of them out of the
 way.
 
 You've also learned how to draw paths, which are the lines and curves that make up our pattern.
-And we've used macros which can help us with repetetive tasks.
+And we've used macros which can help us with repetitive tasks.
 
 What we've gotten so far is a perfectly suitable sewing pattern. You can print this, 
 and make a nice bib out of it.

markdown/dev/tutorials/pattern-design/part2/draft-method/en.md

@@ -88,7 +88,7 @@ Here's a brief summary of the things we've added above:
 - `points`: A container object to hold the part's points
 - `paths`: A container object to hold the part's paths
 
-<Tip compact>Remember: Constructures start with a **C**apital letter</Tip>
+<Tip compact>Remember: Constructors start with a **C**apital letter</Tip>
 
 Long story short: These will make it possible for us to draw points and paths easily.
 

markdown/dev/tutorials/pattern-design/part3/annotations/en.md

@@ -263,7 +263,7 @@ The `title` and `scalebox` macros to be precise.
 Before we add the title, we will also set the cutlist via a method that was added to the
 store by one of the core plugins.
 
-As a matter of fact, all of these snippets, macros, and store methods are provided by plugings.
+As a matter of fact, all of these snippets, macros, and store methods are provided by plugins.
 For more details, [refer to the plugin guide](/guides/plugins).
 
 <Example previewFirst tutorial caption="This looks way better">

markdown/dev/tutorials/pattern-design/part3/complete/en.md

@@ -7,7 +7,7 @@ Laser cutters is merely an example of a situation where your user wants not the
 complete detailed pattern with all annotations, but just the outlines.
 Essentially what we had at the end of part 2 of this tutorial.
 
-Since then, we've added a bunch of embellisments, and perhaps the user does 
+Since then, we've added a bunch of embellishments, and perhaps the user does 
 not want those.
 
 Well, good news: there is a setting for that too. That setting is `complete`, 

markdown/dev/tutorials/pattern-design/part3/flag/en.md

@@ -341,4 +341,3 @@ function draftBib({
 }
 ```
 </Example>
-

markdown/dev/tutorials/pattern-design/part3/menu/en.md

@@ -7,7 +7,7 @@ Strictly speaking, this tutorial is about learning to use FreeSewing's core
 library to do parametric design, and we made great strides in that regard.
 
 But FreeSewing is a lot more than its core library, and you might be wondering
-how your pattern options magically end up in the development environmnt under
+how your pattern options magically end up in the development environment under
 **Design options**:
 
 ![Design options menu](./options.png)
@@ -29,7 +29,7 @@ options: {
 It's just a silly example, but there's two important take-aways here:
 
 - You don't have to use options in your design. You can add options for things
-  that are not about the desing, but that you still want to capture the user's
+  that are not about the design, but that you still want to capture the user's
   input for (like shipping preferences in this case).
 - You can add extra properties to an option. Each option type has it's required
   properties. But you can add more and use them as you see fit.

markdown/dev/tutorials/pattern-design/part3/sa/en.md

@@ -49,11 +49,11 @@ function draftBib({
 ```
 </Example>
 
-As you can see from the source, we can descructure an `sa` variable (short for
+As you can see from the source, we can destructure an `sa` variable (short for
 seam allowance) that will hold either:
 
 - `false` if the user does not want seam allowance
-- A value in `mm` indicating how much seam allwance the user wants
+- A value in `mm` indicating how much seam allowance the user wants
 
 To add seam allowance to our path, we just `offset` it by `sa` and add
 some classes to it to style it. But, crucially, only if the user wants

markdown/dev/tutorials/pattern-design/part3/tests/en.md

@@ -58,7 +58,7 @@ option](test-option-lengthratio.png)
 
 ### neckRatio
 
-The `neckRatio` option will determine the size of the neck opening.  For a the
+The `neckRatio` option will determine the size of the neck opening.  For the
 same `head` measurement, varying this option should result in bibs with
 increasingly larger neck opening.