diff options
| author | Ron Yorston <rmy@pobox.com> | 2012-03-22 15:48:57 +0000 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2012-03-22 15:48:57 +0000 |
| commit | 9db164d6e39050d09f38288c6045cd2a2cbf6d63 (patch) | |
| tree | ea5dc2d28d15da0de25c197ed7d059c3656af1a0 /docs | |
| parent | 1118c95535ea51961437089fc3dece5ab4ea7e1b (diff) | |
| parent | d84b175cb6948eb17f847313bf912174e2f934e1 (diff) | |
| download | busybox-w32-9db164d6e39050d09f38288c6045cd2a2cbf6d63.tar.gz busybox-w32-9db164d6e39050d09f38288c6045cd2a2cbf6d63.tar.bz2 busybox-w32-9db164d6e39050d09f38288c6045cd2a2cbf6d63.zip | |
Merge commit 'd84b175cb6948eb17f847313bf912174e2f934e1' into merge
Conflicts:
include/platform.h
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/unicode.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/unicode.txt b/docs/unicode.txt index 32df24dc8..9c159ce2a 100644 --- a/docs/unicode.txt +++ b/docs/unicode.txt | |||
| @@ -29,7 +29,7 @@ But we also need to handle the following problematic moments: | |||
| 29 | Editors (vi, ed) | 29 | Editors (vi, ed) |
| 30 | 30 | ||
| 31 | This case is a bit similar to "shell input", but unlike shell, | 31 | This case is a bit similar to "shell input", but unlike shell, |
| 32 | editors may encounder many more unexpected unicode sequences | 32 | editors may encounter many more unexpected unicode sequences |
| 33 | (try to load a random binary file...), and they need to preserve | 33 | (try to load a random binary file...), and they need to preserve |
| 34 | them, unlike shell which can afford to drop bogus input. | 34 | them, unlike shell which can afford to drop bogus input. |
| 35 | 35 | ||