diff options
| author | Keith Packard <keithp@keithp.com> | 2014-07-15 22:55:20 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2014-07-15 22:55:20 -0700 |
| commit | 3cf030fffffd223c3717011e03aac82346295d71 (patch) | |
| tree | b6da4fbb1180b75bedb86ce608503a6c0aeb47f3 /doc/altos.xsl | |
| parent | 607fbb01710be1cb263625337f5be3d0fb48d5e7 (diff) | |
| parent | 9ab3a1de95b705783c31a7e16447f52c10b6b480 (diff) | |
Merge tag '1.4' into fox
tagging 1.4 release
Conflicts:
src/Makefile
Diffstat (limited to 'doc/altos.xsl')
| -rw-r--r-- | doc/altos.xsl | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/doc/altos.xsl b/doc/altos.xsl index 5b9e12e8..6092dfcb 100644 --- a/doc/altos.xsl +++ b/doc/altos.xsl @@ -413,7 +413,7 @@ <title>__sfr, __sfr16, __sfr32, __sbit</title> <para> Access to physical registers in the device use this mode - which declares the variable name, it's type and the + which declares the variable name, its type and the address it lives at. No memory is allocated for these variables. </para> @@ -809,7 +809,7 @@ ao_dma_abort(uint8_t id) </programlisting> <para> - Terminate any in-progress DMA transation, marking its + Terminate any in-progress DMA transaction, marking its 'done' variable with the AO_DMA_ABORTED bit. </para> </section> @@ -894,7 +894,7 @@ ao_dma_abort(uint8_t id) </programlisting> <para> - Terminate any in-progress DMA transation, marking its + Terminate any in-progress DMA transaction, marking its 'done' variable with the AO_DMA_ABORTED bit. </para> </section> @@ -904,7 +904,7 @@ <title>Stdio interface</title> <para> AltOS offers a stdio interface over USB, serial and the RF - packet link. This provides for control of the device localy or + packet link. This provides for control of the device locally or remotely. This is hooked up to the stdio functions by providing the standard putchar/getchar/flush functions. These automatically multiplex the available communication channels; @@ -944,7 +944,7 @@ <para> Flushes the current console device output buffer. Any pending characters will be delivered to the target device. - xo </para> + </para> </section> <section> <title>ao_add_stdio</title> |