Skip to content

Fix typos #662

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 15, 2022
Merged

Fix typos #662

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions docs/src/guide/workspaces.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ Now that we have a git repo populated with content, let's serve it through josh:
> This is so that docker can access localhost, where our ad-hoc git repository is served.

To facilitate developement on applications 1 and 2, we want to create workspaces for them.
Creating a new workspace looks very similar to checking out a subfolder through josh, as explain
Creating a new workspace looks very similar to checking out a subfolder through josh, as explained
in "Getting Started".

Instead of just the name of the subfolder, though, we also use the `:workspace=` filter:
Expand Down Expand Up @@ -112,12 +112,12 @@ let's observe the result:
{{#include workspaces.t:library_sync2}}
```

After pushing and fetching the result, we se that it has been succesfully mapped by josh.
After pushing and fetching the result, we see that it has been succesfully mapped by josh.

One suprising thing is the history: our "mapping" commit became a merge commit!
This is because josh needs to merge the history of the module we want to map into the
repository of the workspace.
After this is done, all commit will be present in both of the histories.
After this is done, all commits will be present in both of the histories.

> ***NOTE***
>
Expand Down