summaryrefslogtreecommitdiffstats
path: root/documentation
diff options
context:
space:
mode:
authorScott Rifenbark <scott.m.rifenbark@intel.com>2013-04-01 14:50:02 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-04-04 14:13:44 +0100
commit08938e662025fbf4570ae4404220a6c759973f97 (patch)
tree4f19a48fe91efadcaa230c014797e3408a5bc7e5 /documentation
parent184a6f0c8820707919373f4eb8648155526862fc (diff)
downloadpoky-08938e662025fbf4570ae4404220a6c759973f97.tar.gz
dev-manual: fixed three grammar issues.
(From yocto-docs rev: 56c7b78d17951917611c8b849d6ae4e98297f899) Signed-off-by: Scott Rifenbark <scott.m.rifenbark@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'documentation')
-rw-r--r--documentation/dev-manual/dev-manual-common-tasks.xml8
1 files changed, 4 insertions, 4 deletions
diff --git a/documentation/dev-manual/dev-manual-common-tasks.xml b/documentation/dev-manual/dev-manual-common-tasks.xml
index 5da9861c85..2bcd7d01db 100644
--- a/documentation/dev-manual/dev-manual-common-tasks.xml
+++ b/documentation/dev-manual/dev-manual-common-tasks.xml
@@ -2115,7 +2115,7 @@
2115 You need to name it using your distribution name 2115 You need to name it using your distribution name
2116 (e.g. <filename>mydistro.conf</filename>).</para> 2116 (e.g. <filename>mydistro.conf</filename>).</para>
2117 <para>You can split out parts of your configuration file 2117 <para>You can split out parts of your configuration file
2118 into include file and then "require" them from within 2118 into include files and then "require" them from within
2119 your distribution configuration file. 2119 your distribution configuration file.
2120 Be sure to place the include files in the 2120 Be sure to place the include files in the
2121 <filename>conf/distro/include</filename> directory of 2121 <filename>conf/distro/include</filename> directory of
@@ -2318,7 +2318,7 @@
2318 <listitem><para><filename>merge_config.sh</filename>: 2318 <listitem><para><filename>merge_config.sh</filename>:
2319 Helps you manage configuration files and fragments 2319 Helps you manage configuration files and fragments
2320 within the kernel. 2320 within the kernel.
2321 With this tool you can merge individual configuration 2321 With this tool, you can merge individual configuration
2322 fragments together. 2322 fragments together.
2323 The tool allows you to make overrides and warns you 2323 The tool allows you to make overrides and warns you
2324 of any missing configuration options. 2324 of any missing configuration options.
@@ -2589,7 +2589,7 @@
2589 </para></listitem> 2589 </para></listitem>
2590 <listitem><para>Handling a package name alias 2590 <listitem><para>Handling a package name alias
2591 </para></listitem> 2591 </para></listitem>
2592 <listitem><para>Handling option module packaging 2592 <listitem><para>Handling optional module packaging
2593 </para></listitem> 2593 </para></listitem>
2594 </itemizedlist> 2594 </itemizedlist>
2595 </para> 2595 </para>
@@ -3134,7 +3134,7 @@
3134 By default, the Yocto Project uses 3134 By default, the Yocto Project uses
3135 <filename>SysVinit</filename> as the initialization manager. 3135 <filename>SysVinit</filename> as the initialization manager.
3136 However, support also exists for <filename>systemd</filename>, 3136 However, support also exists for <filename>systemd</filename>,
3137 which is a full replacement of for <filename>init</filename> with 3137 which is a full replacement for <filename>init</filename> with
3138 parallel starting of services, reduced shell overhead and other 3138 parallel starting of services, reduced shell overhead and other
3139 features, used by many distributions. 3139 features, used by many distributions.
3140 </para> 3140 </para>