summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel P. Berrange <berrange@redhat.com>2013-01-03 10:43:20 +0000
committerDaniel P. Berrange <berrange@redhat.com>2013-01-03 11:01:33 +0000
commit977f4e0f5ab766fc4eadd9af9aae1ac53e711c47 (patch)
tree72656ba1011d22a5f221ef8d1a36a12dc14d4fee
parent2ab0bf7431e155183c7f9d81553eb97a5f459365 (diff)
downloadnova-977f4e0f5ab766fc4eadd9af9aae1ac53e711c47.tar.gz
nova-977f4e0f5ab766fc4eadd9af9aae1ac53e711c47.tar.xz
nova-977f4e0f5ab766fc4eadd9af9aae1ac53e711c47.zip
Clarify & fix docs for nova-novncproxy
Clarify docs for nova-novncproxy to indicate that it only serves noVNC web content. Also remove duplicated link from manpage Change-Id: Ia1f4aff21591132a5c41810a371d248ea0001e1f
-rwxr-xr-xbin/nova-novncproxy4
-rw-r--r--doc/source/man/nova-novncproxy.rst10
2 files changed, 7 insertions, 7 deletions
diff --git a/bin/nova-novncproxy b/bin/nova-novncproxy
index 6c911af1e..beee143f5 100755
--- a/bin/nova-novncproxy
+++ b/bin/nova-novncproxy
@@ -17,8 +17,8 @@
# under the License.
'''
-Websocket proxy that is compatible with OpenStack Nova.
-Leverages websockify.py by Joel Martin
+Websocket proxy that is compatible with OpenStack Nova
+noVNC consoles. Leverages websockify.py by Joel Martin
'''
import Cookie
diff --git a/doc/source/man/nova-novncproxy.rst b/doc/source/man/nova-novncproxy.rst
index 92371a1a1..5302fd063 100644
--- a/doc/source/man/nova-novncproxy.rst
+++ b/doc/source/man/nova-novncproxy.rst
@@ -2,9 +2,9 @@
nova-novncproxy
===============
--------------------------------------------
-Websocket novnc Proxy for OpenStack Nova.
--------------------------------------------
+--------------------------------------------------------
+Websocket novnc Proxy for OpenStack Nova noVNC consoles.
+--------------------------------------------------------
:Author: openstack@lists.launchpad.net
:Date: 2012-09-27
@@ -21,7 +21,8 @@ SYNOPSIS
DESCRIPTION
===========
-Websocket proxy that is compatible with OpenStack Nova.
+Websocket proxy that is compatible with OpenStack Nova
+noVNC consoles.
OPTIONS
=======
@@ -40,7 +41,6 @@ SEE ALSO
========
* `OpenStack Nova <http://nova.openstack.org>`__
-* `OpenStack Nova <http://nova.openstack.org>`__
BUGS
====