From 233ecda6eaf2caced508e1e93007bd4acc3542d2 Mon Sep 17 00:00:00 2001 From: Joe Gordon Date: Thu, 16 Aug 2012 13:34:17 -0500 Subject: [PATCH] OpenStack capitalization added to HACKING.rst Along with capitalization fixes to comments in code Change-Id: I72ddc582001f80d954ca5a121903c689f40d08d1 --- HACKING.rst | 9 +++++++++ bin/nova-clear-rabbit-queues | 2 +- bin/nova-console | 2 +- bin/nova-consoleauth | 2 +- bin/nova-novncproxy | 4 ++-- bin/nova-rootwrap | 2 +- bin/nova-volume-usage-audit | 2 +- bin/nova-xvpvncproxy | 2 +- doc/source/devref/xensmvolume.rst | 2 +- nova/common/eventlet_backdoor.py | 2 +- nova/scheduler/filters/trusted_filter.py | 2 +- 11 files changed, 20 insertions(+), 11 deletions(-) diff --git a/HACKING.rst b/HACKING.rst index 8dda1e10c..96805b4d8 100644 --- a/HACKING.rst +++ b/HACKING.rst @@ -214,6 +214,15 @@ The copy of the code should never be directly modified here. Please always update openstack-common first and then run the script to copy the changes across. +OpenStack Trademark +------------------- + +OpenStack is a registered trademark of OpenStack, LLC, and uses the +following capitalization: + + OpenStack + + Commit Messages --------------- Using a common format for commit messages will help keep our git history diff --git a/bin/nova-clear-rabbit-queues b/bin/nova-clear-rabbit-queues index a2484c0b3..0cbf5ab19 100755 --- a/bin/nova-clear-rabbit-queues +++ b/bin/nova-clear-rabbit-queues @@ -1,7 +1,7 @@ #!/usr/bin/env python # vim: tabstop=4 shiftwidth=4 softtabstop=4 -# Copyright (c) 2011 Openstack, LLC. +# Copyright (c) 2011 OpenStack, LLC. # All Rights Reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/bin/nova-console b/bin/nova-console index a40e84c92..97b152930 100755 --- a/bin/nova-console +++ b/bin/nova-console @@ -1,7 +1,7 @@ #!/usr/bin/env python # vim: tabstop=4 shiftwidth=4 softtabstop=4 -# Copyright (c) 2010 Openstack, LLC. +# Copyright (c) 2010 OpenStack, LLC. # All Rights Reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/bin/nova-consoleauth b/bin/nova-consoleauth index 082c7f6a2..f8277daf6 100755 --- a/bin/nova-consoleauth +++ b/bin/nova-consoleauth @@ -1,7 +1,7 @@ #!/usr/bin/env python # vim: tabstop=4 shiftwidth=4 softtabstop=4 -# Copyright (c) 2012 Openstack, LLC. +# Copyright (c) 2012 OpenStack, LLC. # All Rights Reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/bin/nova-novncproxy b/bin/nova-novncproxy index e8e772739..c4eb7a8be 100755 --- a/bin/nova-novncproxy +++ b/bin/nova-novncproxy @@ -1,7 +1,7 @@ #!/usr/bin/env python # vim: tabstop=4 shiftwidth=4 softtabstop=4 -# Copyright (c) 2012 Openstack, LLC. +# Copyright (c) 2012 OpenStack, LLC. # All Rights Reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); you may @@ -17,7 +17,7 @@ # under the License. ''' -Websocket proxy that is compatible with Openstack Nova. +Websocket proxy that is compatible with OpenStack Nova. Leverages websockify.py by Joel Martin ''' diff --git a/bin/nova-rootwrap b/bin/nova-rootwrap index b9827944c..b903f3030 100755 --- a/bin/nova-rootwrap +++ b/bin/nova-rootwrap @@ -1,7 +1,7 @@ #!/usr/bin/env python # vim: tabstop=4 shiftwidth=4 softtabstop=4 -# Copyright (c) 2011 Openstack, LLC. +# Copyright (c) 2011 OpenStack, LLC. # All Rights Reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/bin/nova-volume-usage-audit b/bin/nova-volume-usage-audit index 735786f8f..3e9d88bb5 100755 --- a/bin/nova-volume-usage-audit +++ b/bin/nova-volume-usage-audit @@ -1,7 +1,7 @@ #!/usr/bin/env python # vim: tabstop=4 shiftwidth=4 softtabstop=4 -# Copyright (c) 2011 Openstack, LLC. +# Copyright (c) 2011 OpenStack, LLC. # All Rights Reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); you may diff --git a/bin/nova-xvpvncproxy b/bin/nova-xvpvncproxy index 4a2f0ec11..5929a33b5 100755 --- a/bin/nova-xvpvncproxy +++ b/bin/nova-xvpvncproxy @@ -1,7 +1,7 @@ #!/usr/bin/env python # vim: tabstop=4 shiftwidth=4 softtabstop=4 -# Copyright (c) 2010 Openstack, LLC. +# Copyright (c) 2010 OpenStack, LLC. # All Rights Reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/doc/source/devref/xensmvolume.rst b/doc/source/devref/xensmvolume.rst index c64f2be4a..883cdd931 100644 --- a/doc/source/devref/xensmvolume.rst +++ b/doc/source/devref/xensmvolume.rst @@ -85,4 +85,4 @@ nova-manage sm backend_remove 1 API Changes =========== -No API changes have been introduced so far. The existing euca-create-volume and euca-delete-volume commands (or equivalent Openstack API commands) should be used. +No API changes have been introduced so far. The existing euca-create-volume and euca-delete-volume commands (or equivalent OpenStack API commands) should be used. diff --git a/nova/common/eventlet_backdoor.py b/nova/common/eventlet_backdoor.py index b67608691..f8fccf269 100644 --- a/nova/common/eventlet_backdoor.py +++ b/nova/common/eventlet_backdoor.py @@ -1,6 +1,6 @@ # vim: tabstop=4 shiftwidth=4 softtabstop=4 -# Copyright (c) 2012 Openstack, LLC. +# Copyright (c) 2012 OpenStack, LLC. # Administrator of the National Aeronautics and Space Administration. # All Rights Reserved. # diff --git a/nova/scheduler/filters/trusted_filter.py b/nova/scheduler/filters/trusted_filter.py index a7c711b4e..d4085b7f4 100644 --- a/nova/scheduler/filters/trusted_filter.py +++ b/nova/scheduler/filters/trusted_filter.py @@ -1,7 +1,7 @@ # vim: tabstop=4 shiftwidth=4 softtabstop=4 # Copyright (c) 2012 Intel, Inc. -# Copyright (c) 2011-2012 Openstack, LLC. +# Copyright (c) 2011-2012 OpenStack, LLC. # All Rights Reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); you may