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

Proposed by Colin Watson
Status: Merged
Approved by: Colin Watson
Approved revision: 63ea92eb943b3be099c98b71d724504b4daa318c
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~cjwatson/launchpad:doc-rst
Merge into: launchpad:master
Diff against target: 73 lines (+2/-2)
3 files modified
dev/null (+0/-1)
doc/conf.py (+1/-1)
doc/readme.rst (+1/-0)
Reviewer Review Type Date Requested Status
Jürgen Gmach Approve
Review via email: mp+411670@code.launchpad.net

Commit message

Rename top-level documentation files to *.rst

Description of the change

This is a more usual choice of extension for reStructuredText files.

To post a comment you must log in.
Revision history for this message
Jürgen Gmach (jugmac00) wrote :

Excellent! This would allow editor support if there were a reasonable rst plugin for VS Code :-)

LGTM

review: Approve
Revision history for this message
Colin Watson (cjwatson) wrote :

It at least makes syntax highlighting work automatically in vim, just saying. :-)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/doc/chameleon.txt b/doc/chameleon.rst
2similarity index 100%
3rename from doc/chameleon.txt
4rename to doc/chameleon.rst
5diff --git a/doc/conf.py b/doc/conf.py
6index 038ab03..0d88609 100644
7--- a/doc/conf.py
8+++ b/doc/conf.py
9@@ -30,7 +30,7 @@ extensions = ['sphinx.ext.autodoc', 'sphinx.ext.doctest', 'sphinx.ext.todo']
10 templates_path = ['_templates']
11
12 # The suffix of source filenames.
13-source_suffix = '.txt'
14+source_suffix = '.rst'
15
16 # The encoding of source files.
17 #source_encoding = 'utf-8-sig'
18diff --git a/doc/email.txt b/doc/email.rst
19similarity index 100%
20rename from doc/email.txt
21rename to doc/email.rst
22diff --git a/doc/historical.txt b/doc/historical.rst
23similarity index 100%
24rename from doc/historical.txt
25rename to doc/historical.rst
26diff --git a/doc/index.txt b/doc/index.rst
27similarity index 100%
28rename from doc/index.txt
29rename to doc/index.rst
30diff --git a/doc/malone.txt b/doc/malone.rst
31similarity index 100%
32rename from doc/malone.txt
33rename to doc/malone.rst
34diff --git a/doc/pip.txt b/doc/pip.rst
35similarity index 100%
36rename from doc/pip.txt
37rename to doc/pip.rst
38diff --git a/doc/readme.rst b/doc/readme.rst
39new file mode 120000
40index 0000000..59a23c4
41--- /dev/null
42+++ b/doc/readme.rst
43@@ -0,0 +1 @@
44+../README
45\ No newline at end of file
46diff --git a/doc/readme.txt b/doc/readme.txt
47deleted file mode 120000
48index 59a23c4..0000000
49--- a/doc/readme.txt
50+++ /dev/null
51@@ -1 +0,0 @@
52-../README
53\ No newline at end of file
54diff --git a/doc/scope.txt b/doc/scope.rst
55similarity index 100%
56rename from doc/scope.txt
57rename to doc/scope.rst
58diff --git a/doc/security.txt b/doc/security.rst
59similarity index 100%
60rename from doc/security.txt
61rename to doc/security.rst
62diff --git a/doc/strategy.txt b/doc/strategy.rst
63similarity index 100%
64rename from doc/strategy.txt
65rename to doc/strategy.rst
66diff --git a/doc/values.txt b/doc/values.rst
67similarity index 100%
68rename from doc/values.txt
69rename to doc/values.rst
70diff --git a/doc/webapp-process.txt b/doc/webapp-process.rst
71similarity index 100%
72rename from doc/webapp-process.txt
73rename to doc/webapp-process.rst

Subscribers

People subscribed via source and target branches

to status/vote changes: