Merge 8e42baa into 3b7283f

zopefoundation · Jul 12, 2019 · 3c02d1d · 3c02d1d
2 parents 3b7283f + 8e42baa
commit 3c02d1d
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 28 deletions.
diff --git a/README.txt → CHANGES.rst b/README.txt → CHANGES.rst
@@ -1,22 +1,3 @@
-***********************************************
-Zope3 Application, Instance and Offline Recipes
-***********************************************
-
-Recipes for creating Zope 3 instances with distinguishing features:
-
-- Don't use a skeleton
-
-- Separates application and instance definition
-
-- Don't support package-includes
-
-- Support offline instance.
-
-Unfortunately, partial Windows support at this time.  It works but it's alpha.
-
-.. contents::
-
-
 Releases
 ********
 

diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,3 +1,4 @@
+include *.rst
 include *.py
 include buildout.cfg
-recursive-include zc *.txt
+recursive-include zc *.rst
diff --git a/README.rst b/README.rst
@@ -0,0 +1,18 @@
+***********************************************
+Zope3 Application, Instance and Offline Recipes
+***********************************************
+
+Recipes for creating Zope 3 instances with distinguishing features:
+
+- Don't use a skeleton
+
+- Separates application and instance definition
+
+- Don't support package-includes
+
+- Support offline instance.
+
+Unfortunately, partial Windows support at this time.  It works but it's alpha.
+
+.. contents::
+
diff --git a/setup.py b/setup.py
@@ -34,16 +34,15 @@ def read(*rnames):
     keywords="zope3 buildout",
     url='https://github.com/zopefoundation/%s' % name,
     long_description=(
-        read('README.txt')
+        read('README.rst')
+        + '\n' +
+        read('CHANGES.rst')
         + '\n' +
         'Detailed Documentation\n'
         '**********************\n'
         + '\n' +
-        read('zc', 'zope3recipes', 'README.txt')
-        + '\n' +
-        'Download\n'
-        '**********************\n'
-        ),
+        read('zc', 'zope3recipes', 'README.rst')
+    ),
     packages=find_packages('.'),
     include_package_data=True,
     namespace_packages=['zc'],

diff --git a/zc/zope3recipes/README.txt → zc/zope3recipes/README.rst b/zc/zope3recipes/README.txt → zc/zope3recipes/README.rst
diff --git a/zc/zope3recipes/WINDOWS.txt → zc/zope3recipes/WINDOWS.rst b/zc/zope3recipes/WINDOWS.txt → zc/zope3recipes/WINDOWS.rst
diff --git a/zc/zope3recipes/tests.py b/zc/zope3recipes/tests.py
@@ -311,7 +311,7 @@ def test_suite():
     if sys.platform[:3].lower() == "win":
         suite.addTest(
             doctest.DocFileSuite(
-                'WINDOWS.txt',
+                'WINDOWS.rst',
                 setUp=setUp,
                 tearDown=zc.buildout.testing.buildoutTearDown,
                 checker=checker,
@@ -329,7 +329,7 @@ def test_suite():
         )
         suite.addTest(
             doctest.DocFileSuite(
-                'README.txt',
+                'README.rst',
                 setUp=setUp,
                 tearDown=zc.buildout.testing.buildoutTearDown,
                 checker=checker,