From ccdca3b86cfaf8a4397dd660cd235ac47dfa86b4 Mon Sep 17 00:00:00 2001
From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Nov 20 2017 22:41:35 +0000
Subject: Python eggs: manual edits


---

diff --git a/guidelines/index.rst b/guidelines/index.rst
index 9f1956f..3d9f861 100644
--- a/guidelines/index.rst
+++ b/guidelines/index.rst
@@ -6,6 +6,7 @@ Intro
    :glob:
 
    versioning
+   python-eggs
    meson
 
 Updating this site
diff --git a/guidelines/python-eggs.rst b/guidelines/python-eggs.rst
index 0fde7b7..fa5c8c4 100644
--- a/guidelines/python-eggs.rst
+++ b/guidelines/python-eggs.rst
@@ -1,16 +1,5 @@
-.. raw:: mediawiki
-
-   {{DISPLAYTITLE:Guidelines for Python Egg packaging}}
-
-.. raw:: html
-
-   <div style="float: right; margin-left: 0.5em" class="toclimit-2">
-
-\_\_TOC\_\_
-
-.. raw:: html
-
-   </div>
+Guidelines for Python Egg packaging
+===================================
 
 Python packages provide extra metadata about the package in the form of
 egg metadata. This document explains how to package those metadata.
@@ -36,8 +25,8 @@ When to Provide Egg Metadata
 ----------------------------
 
 When upstream uses setuptools to provide egg metadata it will be
-automatically built and installed when you use the %py{2,3}\_build and
-%py{2,3}\_install macros.
+automatically built and installed when you use the ``%py{2,3}_build`` and
+``%py{2,3}_install`` macros.
 
 Upstream Egg Packages
 ---------------------
@@ -49,7 +38,7 @@ extension, contain compiled binary extensions as well. These are opaque
 structures with no guarantee that they were even built from the source
 distributed with the egg. If you must use an egg package from upstream
 because they do not provide tarballs, you need to include it as a source
-in your spec, unzip it in %setup, and rebuild from the source files
+in your spec, unzip it in ``%setup``, and rebuild from the source files
 contained within it.
 
 Providing Egg Metadata Using Setuptools
@@ -117,7 +106,7 @@ variety of ways.
 -  Manually modifying sys.path is quick if the user just wants to try
    out some code with the old version:
 
-::
+.. code-block:: pycon
 
     >>> import sys
     >>> sys.path.insert(0, '/usr/lib/python2.7/site-packages/CherryPy-2.2.1-py2.7.egg/')
@@ -172,6 +161,3 @@ Links
    Discussion of eggs in Debian
 -  http://mail.python.org/pipermail/distutils-sig/2007-September/008181.html
    -- Discussion of these guidelines on the distutils list
-
-`Category:Packaging guidelines <Category:Packaging_guidelines>`__
-Category:Python