summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Monjalon <thomas.monjalon@6wind.com>2014-11-27 11:02:11 +0100
committerThomas Monjalon <thomas.monjalon@6wind.com>2014-11-27 13:10:03 +0100
commitd737e95480f4893f47b28acd7ac935d919456682 (patch)
tree8e6a6f492ba47d2986b364c605d9fbed0cf6a7ff
parent98a1648109b8dbaa4e6b821c17d1f6bd86d33a9a (diff)
downloaddpdk-d737e95480f4893f47b28acd7ac935d919456682.zip
dpdk-d737e95480f4893f47b28acd7ac935d919456682.tar.gz
dpdk-d737e95480f4893f47b28acd7ac935d919456682.tar.xz
doc: no more bare metal environment
Signed-off-by: Thomas Monjalon <thomas.monjalon@6wind.com>
-rw-r--r--doc/guides/prog_guide/dev_kit_build_system.rst2
-rw-r--r--doc/guides/sample_app_ug/cmd_line.rst2
-rw-r--r--doc/guides/sample_app_ug/hello_world.rst2
-rw-r--r--doc/guides/sample_app_ug/l3_forward_power_man.rst4
-rw-r--r--doc/guides/sample_app_ug/quota_watermark.rst4
-rw-r--r--doc/guides/testpmd_app_ug/testpmd_funcs.rst2
6 files changed, 8 insertions, 8 deletions
diff --git a/doc/guides/prog_guide/dev_kit_build_system.rst b/doc/guides/prog_guide/dev_kit_build_system.rst
index 4981688..d5ee994 100644
--- a/doc/guides/prog_guide/dev_kit_build_system.rst
+++ b/doc/guides/prog_guide/dev_kit_build_system.rst
@@ -300,7 +300,7 @@ Misc
* rte.doc.mk: Documentation in the development kit framework
-* rte.gnuconfigure.mk: Build an application that is configure-based (used to compile *newlib*).
+* rte.gnuconfigure.mk: Build an application that is configure-based.
* rte.subdir.mk: Build several directories in the development kit framework.
diff --git a/doc/guides/sample_app_ug/cmd_line.rst b/doc/guides/sample_app_ug/cmd_line.rst
index dadd32d..0a0ea41 100644
--- a/doc/guides/sample_app_ug/cmd_line.rst
+++ b/doc/guides/sample_app_ug/cmd_line.rst
@@ -114,7 +114,7 @@ This is achieved as follows:
.. code-block:: c
- int MAIN(int argc, char **argv)
+ int main(int argc, char **argv)
{
ret = rte_eal_init(argc, argv);
if (ret < 0)
diff --git a/doc/guides/sample_app_ug/hello_world.rst b/doc/guides/sample_app_ug/hello_world.rst
index 22702b9..3213ba8 100644
--- a/doc/guides/sample_app_ug/hello_world.rst
+++ b/doc/guides/sample_app_ug/hello_world.rst
@@ -85,7 +85,7 @@ This is done in the main() function using the following code:
int
- MAIN(int argc, char **argv)
+ main(int argc, char **argv)
{
ret = rte_eal_init(argc, argv);
diff --git a/doc/guides/sample_app_ug/l3_forward_power_man.rst b/doc/guides/sample_app_ug/l3_forward_power_man.rst
index f02c348..3a93a6b 100644
--- a/doc/guides/sample_app_ug/l3_forward_power_man.rst
+++ b/doc/guides/sample_app_ug/l3_forward_power_man.rst
@@ -165,7 +165,7 @@ The following sections describe aspects that are specific to the L3 Forwarding w
Power Library Initialization
~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The Power library is initialized in the MAIN routine.
+The Power library is initialized in the main routine.
It changes the P-state governor to userspace for specific cores that are under control.
The Timer library is also initialized and several timers are created later on,
responsible for checking if it needs to scale down frequency at run time by checking CPU utilization statistics.
@@ -176,7 +176,7 @@ responsible for checking if it needs to scale down frequency at run time by chec
.. code-block:: c
- int MAIN(int argc, char **argv)
+ int main(int argc, char **argv)
{
struct lcore_conf *qconf;
int ret;
diff --git a/doc/guides/sample_app_ug/quota_watermark.rst b/doc/guides/sample_app_ug/quota_watermark.rst
index c44b0b8..6f537ae 100644
--- a/doc/guides/sample_app_ug/quota_watermark.rst
+++ b/doc/guides/sample_app_ug/quota_watermark.rst
@@ -182,7 +182,7 @@ Core Application - qw
EAL and Drivers Setup
^^^^^^^^^^^^^^^^^^^^^
-The EAL arguments are parsed at the beginning of the MAIN() function:
+The EAL arguments are parsed at the beginning of the main() function:
.. code-block:: c
@@ -236,7 +236,7 @@ The quota and low_watermark shared variables are put into an rte_memzone using a
low_watermark = (unsigned int *) qw_memzone->addr + sizeof(int);
}
-These two variables are initialized to a default value in MAIN() and
+These two variables are initialized to a default value in main() and
can be changed while qw is running using the qwctl control program.
Application Arguments
diff --git a/doc/guides/testpmd_app_ug/testpmd_funcs.rst b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
index 93fd3d4..5e62ff9 100644
--- a/doc/guides/testpmd_app_ug/testpmd_funcs.rst
+++ b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
@@ -103,7 +103,7 @@ stop
quit
~~~~
-Quit to prompt in Linux or reboot on Baremetal:
+Quit to prompt:
quit