← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] ~cjwatson/launchpad:doc-rst into launchpad:master

 

Colin Watson has proposed merging ~cjwatson/launchpad:doc-rst into launchpad:master.

Commit message:
Rename top-level documentation files to *.rst

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/+git/launchpad/+merge/411670

This is a more usual choice of extension for reStructuredText files.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/launchpad:doc-rst into launchpad:master.
diff --git a/doc/chameleon.txt b/doc/chameleon.rst
similarity index 100%
rename from doc/chameleon.txt
rename to doc/chameleon.rst
diff --git a/doc/conf.py b/doc/conf.py
index 038ab03..0d88609 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -30,7 +30,7 @@ extensions = ['sphinx.ext.autodoc', 'sphinx.ext.doctest', 'sphinx.ext.todo']
 templates_path = ['_templates']
 
 # The suffix of source filenames.
-source_suffix = '.txt'
+source_suffix = '.rst'
 
 # The encoding of source files.
 #source_encoding = 'utf-8-sig'
diff --git a/doc/email.txt b/doc/email.rst
similarity index 100%
rename from doc/email.txt
rename to doc/email.rst
diff --git a/doc/historical.txt b/doc/historical.rst
similarity index 100%
rename from doc/historical.txt
rename to doc/historical.rst
diff --git a/doc/index.txt b/doc/index.rst
similarity index 100%
rename from doc/index.txt
rename to doc/index.rst
diff --git a/doc/malone.txt b/doc/malone.rst
similarity index 100%
rename from doc/malone.txt
rename to doc/malone.rst
diff --git a/doc/pip.txt b/doc/pip.rst
similarity index 100%
rename from doc/pip.txt
rename to doc/pip.rst
diff --git a/doc/readme.rst b/doc/readme.rst
new file mode 120000
index 0000000..59a23c4
--- /dev/null
+++ b/doc/readme.rst
@@ -0,0 +1 @@
+../README
\ No newline at end of file
diff --git a/doc/readme.txt b/doc/readme.txt
deleted file mode 120000
index 59a23c4..0000000
--- a/doc/readme.txt
+++ /dev/null
@@ -1 +0,0 @@
-../README
\ No newline at end of file
diff --git a/doc/scope.txt b/doc/scope.rst
similarity index 100%
rename from doc/scope.txt
rename to doc/scope.rst
diff --git a/doc/security.txt b/doc/security.rst
similarity index 100%
rename from doc/security.txt
rename to doc/security.rst
diff --git a/doc/strategy.txt b/doc/strategy.rst
similarity index 100%
rename from doc/strategy.txt
rename to doc/strategy.rst
diff --git a/doc/values.txt b/doc/values.rst
similarity index 100%
rename from doc/values.txt
rename to doc/values.rst
diff --git a/doc/webapp-process.txt b/doc/webapp-process.rst
similarity index 100%
rename from doc/webapp-process.txt
rename to doc/webapp-process.rst