summaryrefslogtreecommitdiffstats
path: root/docs/manual
diff options
context:
space:
mode:
Diffstat (limited to 'docs/manual')
-rw-r--r--docs/manual/common-usage.txt4
-rw-r--r--docs/manual/configure.txt16
-rw-r--r--docs/manual/customize-busybox-config.txt4
-rw-r--r--docs/manual/customize-store.txt4
-rw-r--r--docs/manual/using-buildroot-development.txt4
-rw-r--r--docs/manual/using.txt2
6 files changed, 17 insertions, 17 deletions
diff --git a/docs/manual/common-usage.txt b/docs/manual/common-usage.txt
index 772982af5c..16a13512c2 100644
--- a/docs/manual/common-usage.txt
+++ b/docs/manual/common-usage.txt
@@ -76,9 +76,9 @@ to +make+ or set in the environment:
is the recommended way of setting it.
+
* +BUSYBOX_CONFIG_FILE=<path/to/.config>+, path to
- the Busybox configuration file.
+ the BusyBox configuration file.
+
- Note that the Busybox configuration file can also be set from the
+ Note that the BusyBox configuration file can also be set from the
configuration interface, so through the Buildroot +.config+ file; this
is the recommended way of setting it.
+
diff --git a/docs/manual/configure.txt b/docs/manual/configure.txt
index eb8cb1d7e0..16b9cd6f2d 100644
--- a/docs/manual/configure.txt
+++ b/docs/manual/configure.txt
@@ -272,7 +272,7 @@ different solutions to handle the +/dev+ directory :
requirement to have +CONFIG_DEVTMPFS+ and +CONFIG_DEVTMPFS_MOUNT+
enabled in the kernel configuration still apply), but adds the
+mdev+ userspace utility on top of it. +mdev+ is a program part of
- Busybox that the kernel will call every time a device is added or
+ BusyBox that the kernel will call every time a device is added or
removed. Thanks to the +/etc/mdev.conf+ configuration file, +mdev+
can be configured to for example, set specific permissions or
ownership on a device file, call a script or application whenever a
@@ -314,16 +314,16 @@ graphical applications, other network servers, etc.).
Buildroot allows to use three different types of init systems, which
can be chosen from +System configuration+, +Init system+:
- * The first solution is *Busybox*. Amongst many programs, Busybox has
+ * The first solution is *BusyBox*. Amongst many programs, BusyBox has
an implementation of a basic +init+ program, which is sufficient
for most embedded systems. Enabling the +BR2_INIT_BUSYBOX+ will
- ensure Busybox will build and install its +init+ program. This is
- the default solution in Buildroot. The Busybox +init+ program will
+ ensure BusyBox will build and install its +init+ program. This is
+ the default solution in Buildroot. The BusyBox +init+ program will
read the +/etc/inittab+ file at boot to know what to do. The syntax
of this file can be found in
http://git.busybox.net/busybox/tree/examples/inittab (note that
- Busybox +inittab+ syntax is special: do not use a random +inittab+
- documentation from the Internet to learn about Busybox
+ BusyBox +inittab+ syntax is special: do not use a random +inittab+
+ documentation from the Internet to learn about BusyBox
+inittab+). The default +inittab+ in Buildroot is stored in
+system/skeleton/etc/inittab+. Apart from mounting a few important
filesystems, the main job the default inittab does is to start the
@@ -336,7 +336,7 @@ can be chosen from +System configuration+, +Init system+:
Linux distributions, until they switched to more recent
alternatives such as Upstart or Systemd. +sysvinit+ also works with
an +inittab+ file (which has a slightly different syntax than the
- one from Busybox). The default +inittab+ installed with this init
+ one from BusyBox). The default +inittab+ installed with this init
solution is located in +package/sysvinit/inittab+.
* The third solution is *systemd*. +systemd+ is the new generation
@@ -353,5 +353,5 @@ can be chosen from +System configuration+, +Init system+:
http://www.freedesktop.org/wiki/Software/systemd.
The solution recommended by Buildroot developers is to use the
-*Busybox init* as it is sufficient for most embedded
+*BusyBox init* as it is sufficient for most embedded
systems. *systemd* can be used for more complex situations.
diff --git a/docs/manual/customize-busybox-config.txt b/docs/manual/customize-busybox-config.txt
index ca1613d9ee..a4a85fa55f 100644
--- a/docs/manual/customize-busybox-config.txt
+++ b/docs/manual/customize-busybox-config.txt
@@ -2,9 +2,9 @@
// vim: set syntax=asciidoc:
[[busybox-custom]]
-=== Customizing the Busybox configuration
+=== Customizing the BusyBox configuration
-http://www.busybox.net/[Busybox] is very configurable, and you may
+http://www.busybox.net/[BusyBox] is very configurable, and you may
want to customize it. You can follow these simple steps to do so. This
method isn't optimal, but it's simple, and it works:
diff --git a/docs/manual/customize-store.txt b/docs/manual/customize-store.txt
index 6db8ec7812..e51edb2660 100644
--- a/docs/manual/customize-store.txt
+++ b/docs/manual/customize-store.txt
@@ -80,9 +80,9 @@ work.
To do so, you need to create a normal Buildroot configuration that
builds a basic system for the hardware: toolchain, kernel, bootloader,
-filesystem and a simple Busybox-only userspace. No specific package
+filesystem and a simple BusyBox-only userspace. No specific package
should be selected: the configuration should be as minimal as
-possible, and should only build a working basic Busybox system for the
+possible, and should only build a working basic BusyBox system for the
target platform. You can of course use more complicated configurations
for your internal projects, but the Buildroot project will only
integrate basic board configurations. This is because package
diff --git a/docs/manual/using-buildroot-development.txt b/docs/manual/using-buildroot-development.txt
index 2ecff35250..e660e65e5f 100644
--- a/docs/manual/using-buildroot-development.txt
+++ b/docs/manual/using-buildroot-development.txt
@@ -72,7 +72,7 @@ make linux-rebuild all
-----------------------
and in a matter of seconds gets the updated Linux kernel image in
-+output/images+. Similarly, a change can be made to the Busybox source
++output/images+. Similarly, a change can be made to the BusyBox source
code in +/home/bob/busybox+, and after:
-----------------------
@@ -80,4 +80,4 @@ make busybox-rebuild all
-----------------------
the root filesystem image in +output/images+ contains the updated
-Busybox.
+BusyBox.
diff --git a/docs/manual/using.txt b/docs/manual/using.txt
index 3cd149936a..292349d12d 100644
--- a/docs/manual/using.txt
+++ b/docs/manual/using.txt
@@ -5,7 +5,7 @@
Buildroot has a nice configuration tool similar to the one you can
find in the http://www.kernel.org/[Linux kernel] or in
-http://www.busybox.net/[Busybox]. Note that you can *and should build
+http://www.busybox.net/[BusyBox]. Note that you can *and should build
everything as a normal user*. There is no need to be root to configure
and use Buildroot. The first step is to run the configuration
assistant:
OpenPOWER on IntegriCloud