Convert code-of-conduct to rst

Underline section titles.

Convert links to RST-style links.  NB that the Communication Guide
link won't work ATM; this will be fixed when we convert that document
to RST.

Adjust the formatting for the list so that it's converted properly.

A couple of clean-ups:

* Expand the label for communication guidance, and convert the link to
the project governance to a named reference rather than an "embedded"
URI.

* Move all hyperlink targets to the bottom of the article, and put
  them in the order they're linked.

No changes to the text.

Signed-off-by: George Dunlap <george.dunlap@citrix.com>

diff --git a/source/code-of-conduct.md b/source/code-of-conduct.md
deleted file mode 100644 (file)
index a6080cd..0000000
--- a/source/code-of-conduct.md
+++ /dev/null
@@ -1,91 +0,0 @@
-# Xen Project Code of Conduct
-
-## Our Pledge
-
-In the interest of fostering an open and welcoming environment, we as
-contributors and maintainers pledge to make participation in our project and
-our community a harassment-free experience for everyone, regardless of age, body
-size, disability, ethnicity, sex characteristics, gender identity and
-expression, level of experience, education, socio-economic status, nationality,
-personal appearance, race, religion, or sexual identity and orientation.
-
-## Our Standards
-
-We believe that a Code of Conduct can help create a harassment-free environment,
-but is not sufficient to create a welcoming environment on its own: guidance on
-creating a welcoming environment, how to communicate in an effective and
-friendly way, etc. can be found [here][guidance]].
-
-Examples of unacceptable behavior by participants include:
-
-* The use of sexualized language or imagery and unwelcome sexual attention or
-  advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or electronic
-  address, without explicit permission
-* Other conduct which could reasonably be considered inappropriate in a
-  professional setting
-
-## Our Responsibilities
-
-Project leadership team members are responsible for clarifying the standards of
-acceptable behavior and are expected to take appropriate and fair corrective
-action in response to any instances of unacceptable behavior.
-
-Project leadership team members have the right and responsibility to remove,
-edit, or reject comments, commits, code, wiki edits, issues, and other
-contributions that are not aligned to this Code of Conduct, or to ban
-temporarily or permanently any contributor for other behaviors that they deem
-inappropriate, threatening, offensive, or harmful.
-
-## Scope
-
-This Code of Conduct applies within all project spaces of all sub-projects,
-and it also applies when an individual is representing the project or its
-community in public spaces. Examples of representing a project or community
-include using an official project e-mail address, posting via an official social
-media account, or acting as an appointed representative at an online or offline
-event. Representation of a project may be further defined and clarified by the
-project leadership.
-
-## What to do if you witness or are subject to unacceptable behavior
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting Conduct Team members at conduct@xenproject.org. All
-complaints will be reviewed and investigated and will result in a response that
-is deemed necessary and appropriate to the circumstances. Conduct Team members
-are obligated to maintain confidentiality with regard to the reporter of an
-incident. Further details of specific enforcement policies may be posted
-separately.
-
-If you have concerns about any of the members of the conduct@ alias,
-you are welcome to contact precisely the Conduct Team member(s) of
-your choice.
-
-Project leadership team members who do not follow or enforce the Code of Conduct
-in good faith may face temporary or permanent repercussions as determined by
-other members of the project's leadership.
-
-## Conduct Team members
-Conduct Team members are project leadership team members from any
-sub-project. The current list of Conduct Team members is:
-* Lars Kurth <lars dot kurth at xenproject dot org>
-* George Dunlap <george dot dunlap at citrix dot com>
-* Ian Jackson <ian dot jackson at citrix dot com>
-
-Conduct Team members are changed by proposing a change to this document,
-posted on all sub-project lists, followed by a formal global vote as outlined
-[here]: https://xenproject.org/developers/governance/#project-decisions
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage],
-version 1.4, available at
-https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
-
-[homepage]: https://www.contributor-covenant.org
-[guidance]: communication-guide.md
-
-For answers to common questions about this code of conduct, see
-https://www.contributor-covenant.org/faq

diff --git a/source/code-of-conduct.rst b/source/code-of-conduct.rst
new file mode 100644 (file)
index 0000000..81efe04
--- /dev/null
+++ b/source/code-of-conduct.rst
@@ -0,0 +1,102 @@
+Xen Project Code of Conduct
+***************************
+
+Our Pledge
+==========
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to make participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, sex characteristics, gender identity and
+expression, level of experience, education, socio-economic status, nationality,
+personal appearance, race, religion, or sexual identity and orientation.
+
+Our Standards
+=============
+
+We believe that a Code of Conduct can help create a harassment-free environment,
+but is not sufficient to create a welcoming environment on its own: guidance on
+creating a welcoming environment, how to communicate in an effective and
+friendly way, etc. can be found `here <Communication Guidance_>`_.
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or
+  advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic
+  address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+Our Responsibilities
+====================
+
+Project leadership team members are responsible for clarifying the standards of
+acceptable behavior and are expected to take appropriate and fair corrective
+action in response to any instances of unacceptable behavior.
+
+Project leadership team members have the right and responsibility to remove,
+edit, or reject comments, commits, code, wiki edits, issues, and other
+contributions that are not aligned to this Code of Conduct, or to ban
+temporarily or permanently any contributor for other behaviors that they deem
+inappropriate, threatening, offensive, or harmful.
+
+Scope
+=====
+
+This Code of Conduct applies within all project spaces of all sub-projects,
+and it also applies when an individual is representing the project or its
+community in public spaces. Examples of representing a project or community
+include using an official project e-mail address, posting via an official social
+media account, or acting as an appointed representative at an online or offline
+event. Representation of a project may be further defined and clarified by the
+project leadership.
+
+What to do if you witness or are subject to unacceptable behavior
+=================================================================
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting Conduct Team members at conduct@xenproject.org. All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. Conduct Team members
+are obligated to maintain confidentiality with regard to the reporter of an
+incident. Further details of specific enforcement policies may be posted
+separately.
+
+If you have concerns about any of the members of the conduct@ alias,
+you are welcome to contact precisely the Conduct Team member(s) of
+your choice.
+
+Project leadership team members who do not follow or enforce the Code of Conduct
+in good faith may face temporary or permanent repercussions as determined by
+other members of the project's leadership.
+
+Conduct Team members
+====================
+
+Conduct Team members are project leadership team members from any
+sub-project. The current list of Conduct Team members is:
+
+* Lars Kurth <lars dot kurth at xenproject dot org>
+* George Dunlap <george dot dunlap at citrix dot com>
+* Ian Jackson <ian dot jackson at citrix dot com>
+
+Conduct Team members are changed by proposing a change to this document,
+posted on all sub-project lists, followed by a formal global vote as outlined
+`here <Project Governance_>`_.
+
+Attribution
+===========
+
+This Code of Conduct is adapted from the `Contributor Covenant`_,
+version 1.4, available at
+https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
+
+For answers to common questions about this code of conduct, see
+https://www.contributor-covenant.org/faq
+
+.. _Communication Guidance: communication-guide.md
+.. _Project Governance: https://xenproject.org/developers/governance/#project-decisions
+.. _Contributor Covenant: https://www.contributor-covenant.org

diff --git a/source/conf.py b/source/conf.py
index 7b99910863423d06ef46401702758b0a5a42b65f..85bcedb5343b54ab22c0b34bc76b18fd5a900806 100644 (file)
--- a/source/conf.py
+++ b/source/conf.py
@@ -49,4 +49,4 @@ html_theme = 'alabaster'
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ['_static']
\ No newline at end of file
+html_static_path = ['_static']

diff --git a/source/index.rst b/source/index.rst
index 99cb386a5b20ab36cbb27b0544b921d0774908a4..079c02edb4660451539ff45d208ced704511579f 100644 (file)
--- a/source/index.rst
+++ b/source/index.rst
@@ -10,6 +10,7 @@ Welcome to XenProject Governance's documentation!
    :maxdepth: 2
    :caption: Contents:
 
+   code-of-conduct
 
 Indices and tables
 ==================