diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-01-03 19:32:49 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-01-03 19:32:49 +0000 |
| commit | dcb79ba1e6e20a8fb07205a4558cb93f3c5d5052 (patch) | |
| tree | 8002b10d08dce40919c17733753a97cd1e871f95 | |
| parent | ec648c01606ea68522e69dfe926860a584325cc7 (diff) | |
| parent | 977f4e0f5ab766fc4eadd9af9aae1ac53e711c47 (diff) | |
Merge "Clarify & fix docs for nova-novncproxy"
| -rwxr-xr-x | bin/nova-novncproxy | 4 | ||||
| -rw-r--r-- | 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 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 ==== |