From 977f4e0f5ab766fc4eadd9af9aae1ac53e711c47 Mon Sep 17 00:00:00 2001 From: "Daniel P. Berrange" Date: Thu, 3 Jan 2013 10:43:20 +0000 Subject: [PATCH] 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 --- bin/nova-novncproxy | 4 ++-- doc/source/man/nova-novncproxy.rst | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/bin/nova-novncproxy b/bin/nova-novncproxy index 6c911af1eef2..beee143f5f9f 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 92371a1a1a91..5302fd0631ee 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 ======= @@ -39,7 +40,6 @@ FILES SEE ALSO ======== -* `OpenStack Nova `__ * `OpenStack Nova `__ BUGS