Skip to content

Commit 3c8e532

Browse files
author
Phil Shafer
committed
Merge branch 'master' into develop
2 parents 212f8d0 + 290d886 commit 3c8e532

File tree

3 files changed

+27
-4
lines changed

3 files changed

+27
-4
lines changed

.github/workflows/c-cpp.yml

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
name: C/C++ CI
2+
3+
on:
4+
push:
5+
branches: [ master develop ]
6+
pull_request:
7+
branches: [ master develop ]
8+
9+
jobs:
10+
build:
11+
12+
runs-on: ubuntu-latest
13+
14+
steps:
15+
- uses: actions/checkout@v2
16+
- name: configure
17+
run: ./configure
18+
- name: make
19+
run: make
20+
- name: make check
21+
run: make check
22+
- name: make distcheck
23+
run: make distcheck

.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@ notifications:
1212

1313
branches:
1414
only:
15-
- master
1615
- develop
16+
- master

libxo/libxo.3

+3-3
Original file line numberDiff line numberDiff line change
@@ -182,9 +182,9 @@ and HTML output using a common set of function calls.
182182
The application
183183
decides at run time which output style should be produced.
184184
The
185-
application calls a function
185+
application calls the function
186186
.Xr xo_emit 3
187-
to product output that is
187+
to produce output that is
188188
described in a format string.
189189
A
190190
.Dq field descriptor
@@ -208,7 +208,7 @@ a
208208
format string.
209209
.Pp
210210
Output
211-
can then be generated in various style, using the "--libxo" option.
211+
can then be generated in various styles, using the "--libxo" option.
212212
.Sh DEFAULT HANDLE
213213
Handles give an abstraction for
214214
.Nm

0 commit comments

Comments
 (0)