aboutsummaryrefslogtreecommitdiff
path: root/guide
diff options
context:
space:
mode:
Diffstat (limited to 'guide')
-rw-r--r--guide/configuration.md10
-rw-r--r--guide/faq.md10
-rw-r--r--guide/quickstart.md2
3 files changed, 11 insertions, 11 deletions
diff --git a/guide/configuration.md b/guide/configuration.md
index baca8055..d81a2aec 100644
--- a/guide/configuration.md
+++ b/guide/configuration.md
@@ -4,7 +4,7 @@ Set compilation configuration before building project with command `xmake f|conf
And if you want to known more options, please run: `xmake f --help`。
<p class="tip">
- You can use short or long command option, for exmaple: <br>
+ You can use short or long command option, for example: <br>
`xmake f` or `xmake config`.<br>
`xmake f -p linux` or `xmake config --plat=linux`.
</p>
@@ -91,9 +91,9 @@ Fro other cross platform:
```bash
$ xmake f -p cross --sdk=/usr/local/arm-xxx-gcc/ [--bin=/sdk/bin] [--cross=arm-linux-]
$ xmake
-```
+```
-For custem cross platform (`is_plat("myplat")`):
+For custom cross platform (`is_plat("myplat")`):
```bash
$ xmake f -p myplat --sdk=/usr/local/arm-xxx-gcc/ [--bin=/sdk/bin] [--cross=arm-linux-]
@@ -319,12 +319,12 @@ $ xmake
```
<p class="tip">
- You can use short or long command option, for exmaple: `xmake g` or `xmake global`.<br>
+ You can use short or long command option, for example: `xmake g` or `xmake global`.<br>
</p>
## Clean Configuration
-We can clean all cached configuration and re-configure projecct.
+We can clean all cached configuration and re-configure project.
```bash
$ xmake f -c
diff --git a/guide/faq.md b/guide/faq.md
index fc6223d2..c12848a1 100644
--- a/guide/faq.md
+++ b/guide/faq.md
@@ -11,9 +11,9 @@ Get the help info of the configuration command.
```bash
$ xmake f [-h|--help]
-```
+```
-Get the help info of the givent action or plugin command.
+Get the help info of the given action or plugin command.
```bash
$ xmake [action|plugin] [-h|--help]
@@ -42,7 +42,7 @@ $ xmake
If it fails again, please add `-v` or `--verbose` options to get more verbose info.
-For exmaple:
+For example:
```hash
$ xmake [-v|--verbose]
@@ -60,7 +60,7 @@ $ xmake -v --backtrace
$ xmake [-w|--warning]
```
-## How to scan source code and generate xmake.lua automaticlly?
+## How to scan source code and generate xmake.lua automatically?
You only need run the following command:
@@ -68,7 +68,7 @@ You only need run the following command:
$ xmake
```
-xmake will scan all source code in current directory and build it automaticlly.
+xmake will scan all source code in current directory and build it automatically.
And we can run it directly.
diff --git a/guide/quickstart.md b/guide/quickstart.md
index afcbde9d..34076d66 100644
--- a/guide/quickstart.md
+++ b/guide/quickstart.md
@@ -81,6 +81,6 @@ hello`main:
```
<p class="tip">
- You can also use short command option, for exmaple: `xmake r` or `xmake run`
+ You can also use short command option, for example: `xmake r` or `xmake run`
</p>