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 /README | |
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 'README')
-rw-r--r-- | README | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -45,7 +45,7 @@ Using busybox: | |||
45 | run (I.E. "./busybox ls -l /proc"). | 45 | run (I.E. "./busybox ls -l /proc"). |
46 | 46 | ||
47 | The "standalone shell" mode is an easy way to try out busybox; this is a | 47 | The "standalone shell" mode is an easy way to try out busybox; this is a |
48 | command shell that calls the builtin applets without needing them to be | 48 | command shell that calls the built-in applets without needing them to be |
49 | installed in the path. (Note that this requires /proc to be mounted, if | 49 | installed in the path. (Note that this requires /proc to be mounted, if |
50 | testing from a boot floppy or in a chroot environment.) | 50 | testing from a boot floppy or in a chroot environment.) |
51 | 51 | ||
@@ -170,7 +170,7 @@ Portability: | |||
170 | MacOS X, Solaris, Cygwin, or the BSD Fork Du Jour). This generally involves | 170 | MacOS X, Solaris, Cygwin, or the BSD Fork Du Jour). This generally involves |
171 | a different kernel and a different C library at the same time. While it | 171 | a different kernel and a different C library at the same time. While it |
172 | should be possible to port the majority of the code to work in one of | 172 | should be possible to port the majority of the code to work in one of |
173 | these environments, don't be suprised if it doesn't work out of the box. If | 173 | these environments, don't be surprised if it doesn't work out of the box. If |
174 | you're into that sort of thing, start small (selecting just a few applets) | 174 | you're into that sort of thing, start small (selecting just a few applets) |
175 | and work your way up. | 175 | and work your way up. |
176 | 176 | ||