Skip to content

Documentation: Fix spelling typos in files under packages dir #7439

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
Jul 9, 2020
Merged

Documentation: Fix spelling typos in files under packages dir #7439

Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions package/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
## Release model

The release model is linear. That means that there is only one main code branch, and releases are snapshots of that branch at specific points in the sequence of commits.
The advantage of this model is that the maintenance effort is greately reduced compared to other release models, such as a branched model.
The advantage of this model is that the maintenance effort is greatly reduced compared to other release models, such as a branched model.
The disadvantage is that progress is ever only forward, and fixes can't be backported to prior releases. this means there is no such thing as a "stable" release (however, see Sub releases below).

There are 4 types of releases:
Expand Down Expand Up @@ -118,7 +118,7 @@ The following points assume work in a direct clone of the repository, and not in

6. Navigate to [Travis CI options](https://travis-ci.org/esp8266/Arduino/settings), enable ´Build pushed branches´ (before tagging in next step)

7. Tag the latest commit on the master branch. In this project, tags have form `X.Y.Z`, e.g. `3.0.0`, or `X.Y.Z-betaN` for release candiate versions. Notice that there's no `v`at the beginning of the tag. Tags must be annotated, not lightweight tags. To create a tag, use git command (assuming that the master branch is checked out):
7. Tag the latest commit on the master branch. In this project, tags have form `X.Y.Z`, e.g. `3.0.0`, or `X.Y.Z-betaN` for release candidate versions. Notice that there's no `v`at the beginning of the tag. Tags must be annotated, not lightweight tags. To create a tag, use git command (assuming that the master branch is checked out):

```
git tag -a -m "Release 3.0.0" 3.0.0
Expand Down
6 changes: 3 additions & 3 deletions package/esp8266-arduino-doc.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ echo "documentation template url: "$doc_template_url
echo " url: "$url

# continue?
read -e -p "Dou you wish to continue (y/n)? " -n 1 decision
read -e -p "Do you wish to continue (y/n)? " -n 1 decision
if echo "$decision" | grep -iq "^y" ;then
echo "okay"
else
Expand All @@ -59,7 +59,7 @@ rm -fR $destination_path
mkdir -p $destination_path/src
mkdir -p $destination_path/$version

# copy doc files to destination soruce dir
# copy doc files to destination source dir
cp -R $arduinoESP_src/doc/* $destination_path/src

# download doc template
Expand All @@ -68,7 +68,7 @@ rsync -av $doc_src_path/ $destination_path/build/

# create versions.html file

# ... read verions
# ... read versions
pushd $arduinoESP_src
old_versions=$(git ls-tree -d --name-only remotes/origin/gh-pages versions/ | sed -e 's/versions\///g')
popd
Expand Down