diff --git a/docs/source/topics/bugshugscode.rst b/docs/source/topics/bugshugscode.rst
index 22218758..e23b61fb 100644
--- a/docs/source/topics/bugshugscode.rst
+++ b/docs/source/topics/bugshugscode.rst
@@ -7,13 +7,13 @@ Bugs & Hugs & Code
 Community
 =========
 
-DEVSTACKpy is an open-source tool released under the `apache version 2.0
-license`_. It *depends* on its **community** to keep it alive.
+DEVSTACKpy is an open-source tool released under the `apache version 2.0 license`_. It *depends* on its **community** to keep it alive.
 
 Source code
 ===========
 
-The source code is on github @
+The source code is on github located at:
+
 https://github.com/yahoo/Openstack-DevstackPy.
 
 Feel free to fork it and contribute to it. You can also get a tarball or
@@ -22,7 +22,8 @@ zip archive of the code.
 Tags
 ----
 
-Stable *tags* can also be downloaded @
+Stable *tags* can also be downloaded:
+
 https://github.com/yahoo/Openstack-DevstackPy/tags.
 
     **Note:** that for these tags you may have to edit *conf/stack.ini*
@@ -31,19 +32,14 @@ https://github.com/yahoo/Openstack-DevstackPy/tags.
 Bugs/Features
 =============
 
-Please use github’s `issue tracking system`_ or launchpad’s `issue
-tracking system`_ to report or follow bugs or to discuss features and
-get support.
+Please use `github’s issue tracking system`_ or `launchpad’s issue tracking system`_ to report or follow bugs or to discuss features and get support.
 
 Discussions
 ===========
 
-Please either use launchpad’s `email system`_ or find us on
-``irc.freenode.net`` in channel ``#openstack-devstackpy``
+Please either use `launchpad’s email system`_ or find us on ``irc.freenode.net`` in channel ``#openstack-devstackpy``
 
-.. _apache version 2.0
-license: https://github.com/yahoo/Openstack-DevstackPy/blob/master/LICENSE
-.. _issue tracking
-system: https://github.com/yahoo/Openstack-Devstackpy/issues
-.. _issue tracking system: http://launchpad.net/~devstackpy
-.. _email system: https://launchpad.net/%7Edevstackpy/+contactuser
\ No newline at end of file
+.. _apache version 2.0 license: https://github.com/yahoo/Openstack-DevstackPy/blob/master/LICENSE
+.. _github’s issue tracking system: https://github.com/yahoo/Openstack-Devstackpy/issues
+.. _launchpad’s issue tracking system: http://launchpad.net/~devstackpy
+.. _launchpad’s email system: https://launchpad.net/%7Edevstackpy/+contactuser