OpenStack capitalization added to HACKING.rst

Along with capitalization fixes to comments in code Change-Id: I72ddc582001f80d954ca5a121903c689f40d08d1
2012-08-16 13:34:17 -05:00 · 2012-08-16 13:34:17 -05:00 · b0392d3017
parent a10be151ad
commit b0392d3017
21 changed files with 31 additions and 22 deletions
--- 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
--- 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
--- 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
--- 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");
--- 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
 '''

--- 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
--- 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
--- 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");
--- 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.
--- 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.
 #
--- a/nova/db/sqlalchemy/migrate_repo/versions/092_add_instance_system_metadata.py
+++ b/nova/db/sqlalchemy/migrate_repo/versions/092_add_instance_system_metadata.py
@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4

-# Copyright 2012 Openstack, LLC.
+# Copyright 2012 OpenStack, LLC.
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
--- a/nova/db/sqlalchemy/migrate_repo/versions/093_drop_instance_actions_table.py
+++ b/nova/db/sqlalchemy/migrate_repo/versions/093_drop_instance_actions_table.py
@ -1,6 +1,6 @@
 # vim: tabstop=4 shiftwidth=4 softtabstop=4

-# Copyright 2012 Openstack, LLC.
+# Copyright 2012 OpenStack, LLC.
 # All Rights Reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
--- 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
--- a/nova/tests/api/openstack/compute/test_flavors.py
+++ b/nova/tests/api/openstack/compute/test_flavors.py
@ -794,7 +794,7 @@ class DisabledFlavorsWithRealDBTest(test.TestCase):
        self.assertEqual(flavor['name'], self.disabled_type['name'])

        # FIXME(sirp): the disabled field is currently namespaced so that we
-        # don't impact the Openstack API. Eventually this should probably be
+        # don't impact the OpenStack API. Eventually this should probably be
        # made a first-class attribute in the next OSAPI version.
        self.assert_('OS-FLV-DISABLED:disabled' in flavor)

--- a/nova/tests/test_metadata.py
+++ b/nova/tests/test_metadata.py
@ -235,9 +235,9 @@ class MetadataTestCase(test.TestCase):
        self.assertTrue(md._check_version('2009-04-04', '2009-04-04'))


-class OpenstackMetadataTestCase(test.TestCase):
+class OpenStackMetadataTestCase(test.TestCase):
    def setUp(self):
-        super(OpenstackMetadataTestCase, self).setUp()
+        super(OpenStackMetadataTestCase, self).setUp()
        self.instance = INSTANCES[0]
        fake_network.stub_out_nw_api_get_instance_nw_info(self.stubs,
                                                          spectacular=True)
--- a/nova/virt/powervm/operator.py
+++ b/nova/virt/powervm/operator.py
@ -100,7 +100,7 @@ class PowerVMOperator(object):
        """
        lpar_instances = self._operator.list_lpar_instances()
        # We filter out instances that haven't been created
-        # via Openstack. Notice that this is fragile and it can
+        # via OpenStack. Notice that this is fragile and it can
        # be improved later.
        instances = [instance for instance in lpar_instances
                     if re.search(r'^instance-[0-9]{8}$', instance)]
--- a/nova/virt/xenapi/vm_utils.py
+++ b/nova/virt/xenapi/vm_utils.py
@ -2,7 +2,7 @@

 # Copyright (c) 2010 Citrix Systems, Inc.
 # Copyright 2011 Piston Cloud Computing, Inc.
-# Copyright 2012 Openstack, LLC.
+# Copyright 2012 OpenStack, LLC.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
 #    not use this file except in compliance with the License. You may obtain
--- a/plugins/xenserver/xenapi/etc/xapi.d/plugins/glance
+++ b/plugins/xenserver/xenapi/etc/xapi.d/plugins/glance
@ -1,6 +1,6 @@
 #!/usr/bin/env python

-# Copyright (c) 2012 Openstack, LLC
+# Copyright (c) 2012 OpenStack, LLC
 # Copyright (c) 2010 Citrix Systems, Inc.
 # Copyright 2010 United States Government as represented by the
 # Administrator of the National Aeronautics and Space Administration.
--- a/plugins/xenserver/xenapi/etc/xapi.d/plugins/kernel
+++ b/plugins/xenserver/xenapi/etc/xapi.d/plugins/kernel
@ -1,6 +1,6 @@
 #!/usr/bin/env python

-# Copyright (c) 2012 Openstack, LLC
+# Copyright (c) 2012 OpenStack, LLC
 # Copyright (c) 2010 Citrix Systems, Inc.
 # Copyright 2010 United States Government as represented by the
 # Administrator of the National Aeronautics and Space Administration.
--- a/plugins/xenserver/xenapi/etc/xapi.d/plugins/utils.py
+++ b/plugins/xenserver/xenapi/etc/xapi.d/plugins/utils.py
@ -1,4 +1,4 @@
-# Copyright (c) 2012 Openstack, LLC
+# Copyright (c) 2012 OpenStack, LLC
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
 #    not use this file except in compliance with the License. You may obtain
--- a/plugins/xenserver/xenapi/etc/xapi.d/plugins/workarounds
+++ b/plugins/xenserver/xenapi/etc/xapi.d/plugins/workarounds
@ -1,6 +1,6 @@
 #!/usr/bin/env python

-# 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