diff options
| author | Roman Yeryomin <roman@advem.lv> | 2013-05-26 01:02:55 +0300 |
|---|---|---|
| committer | Roman Yeryomin <roman@advem.lv> | 2013-05-26 01:02:55 +0300 |
| commit | 342045a35b1981a89e4bc80842b10c065e1050da (patch) | |
| tree | 4140720b20e8d641c11da882010d6130a75fef21 /docs | |
| parent | 7338133dde8238afce34676214b494c8db96689b (diff) | |
| parent | 1a116ce7818ecee5d167a9c0ebb1a0feca9120e6 (diff) | |
Merge trunk into realtek-unstable
Conflicts:
Config.in
feeds.conf.default
package/base-files/files/etc/hotplug2-common.rules
package/network/config/netifd/files/etc/init.d/network
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/config.tex | 4 | ||||
| -rw-r--r-- | docs/network-scripts.tex | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/docs/config.tex b/docs/config.tex index 17417c99a..08318b4b6 100644 --- a/docs/config.tex +++ b/docs/config.tex @@ -23,7 +23,7 @@ To be able to load configuration files, you need to include the common functions with: \begin{Verbatim} -. /etc/functions.sh +. /lib/functions.sh \end{Verbatim} Then you can use \texttt{config\_load \textit{<name>}} to load config files. The function @@ -32,7 +32,7 @@ it from \texttt{/etc/config} (which is the most common way of using it). If you want to use special callbacks for sections and/or options, you need to define the following shell functions before running \texttt{config\_load} -(after including \texttt{/etc/functions.sh}): +(after including \texttt{/lib/functions.sh}): \begin{Verbatim} config_cb() { diff --git a/docs/network-scripts.tex b/docs/network-scripts.tex index 4e713953a..7ace9755c 100644 --- a/docs/network-scripts.tex +++ b/docs/network-scripts.tex @@ -4,7 +4,7 @@ To be able to access the network functions, you need to include the necessary shell scripts by running: \begin{Verbatim} -. /etc/functions.sh # common functions +. /lib/functions.sh # common functions include /lib/network # include /lib/network/*.sh scan_interfaces # read and parse the network config \end{Verbatim} |