summaryrefslogtreecommitdiffhomepage
path: root/doc
diff options
context:
space:
mode:
authorIsaku Yamahata <yamahata@valinux.co.jp>2012-01-04 16:14:16 +0900
committerFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>2012-01-04 16:16:05 +0900
commitfdbb049efc71c1375fd60b28caba2242aa2a50b5 (patch)
treef46cdf62ca8c0adc9663d1df535f7b3dc22b082e /doc
parenta4b65e5ba18ba30f947cfc51faa152791f8b9334 (diff)
doc: use Network Operating System instead of Network OS for consistency
s/Network OS/Network Operating System/g Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Diffstat (limited to 'doc')
-rw-r--r--doc/source/getting_started.rst10
-rw-r--r--doc/source/index.rst6
-rw-r--r--doc/source/using_with_openstack.rst13
3 files changed, 15 insertions, 14 deletions
diff --git a/doc/source/getting_started.rst b/doc/source/getting_started.rst
index bfc108ec..a587599e 100644
--- a/doc/source/getting_started.rst
+++ b/doc/source/getting_started.rst
@@ -4,9 +4,9 @@
Getting Started
***************
-Overview/What's Ryu the Network OS
-==================================
-Ryu is an open-sourced Network OS which is licensed under GPL v3.
+Overview/What's Ryu the Network Operating System
+================================================
+Ryu is an open-sourced Network Operating System which is licensed under GPL v3.
It supports openflow protocol.
If you are not familiar with Software Defined Network(SDN) and
@@ -17,8 +17,8 @@ The mailing list is available at
`ryu-devel ML <https://lists.sourceforge.net/lists/listinfo/ryu-devel>`_
-Installing Ryu Network OS
-=========================
+Installing Ryu Network Operating System
+=======================================
Extract source code and just type::
% python ./setup.py install
diff --git a/doc/source/index.rst b/doc/source/index.rst
index 2320e219..ff2e6fd4 100644
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -3,9 +3,9 @@
You can adapt this file completely to your liking, but it should at least
contain the root `toctree` directive.
-**********************************
-Welcome to RYU the Network OS(NOS)
-**********************************
+************************************************
+Welcome to RYU the Network Operating System(NOS)
+************************************************
Contents:
diff --git a/doc/source/using_with_openstack.rst b/doc/source/using_with_openstack.rst
index bd8c2d52..ad0a4afa 100644
--- a/doc/source/using_with_openstack.rst
+++ b/doc/source/using_with_openstack.rst
@@ -1,8 +1,8 @@
.. _using_with_openstack:
-***************************************************************
-Using Ryu Network OS with with OpenStack as OpenFlow controller
-***************************************************************
+*****************************************************************************
+Using Ryu Network Operating System with with OpenStack as OpenFlow controller
+*****************************************************************************
This section describes how to setup openstack (nova, quantum) and
ryu-manager.
It is assumed that kvm with libvirt is used and each host machines that run
@@ -170,7 +170,7 @@ from the source, please refer to OpenStack document and get back here again.
Testing
=======
-Yay, now you have ryu network OS set up.
+Yay, now you have ryu network Operating System set up.
You would want to really they are L2-segregated.
* create multi projects and run instances.
@@ -197,7 +197,7 @@ gw-xxx and gw-yyy, not directly.
Caveats
=======
* Run the following daemons in this order
- #. Run Ryu network OS
+ #. Run Ryu network Operating System
#. Run quantum with OVS plugin
#. Run quantum OVS agent
#. run your guest instance
@@ -223,7 +223,8 @@ setting. If you success it, please report it.
single NIC/All-in-One setting
-----------------------------
If your host machines have only single NIC, it would be possible to use
-Ryu network OS with Linux bridge. However we haven't tested such setups.
+Ryu network Operating System with Linux bridge. However we haven't tested such
+setups.
.. image:: /images/compute-node.png