Created
May 30, 2014 09:48
-
-
Save jaylett/58dcfe52c3380a937698 to your computer and use it in GitHub Desktop.
Don't emphasise lines in the examples; put python3 documentation in a different place to python(2)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/xapian-bindings/python/docs/examples.rst b/xapian-bindings/python/docs/examples.rst | |
index d1ee064..d2e2974 100644 | |
--- a/xapian-bindings/python/docs/examples.rst | |
+++ b/xapian-bindings/python/docs/examples.rst | |
@@ -8,7 +8,6 @@ simplesearch.py | |
.. literalinclude :: examples/simplesearch.py | |
:language: python | |
- :emphasize-lines: 12,15-18 | |
:linenos: | |
.. _simpleindex: | |
@@ -18,7 +17,6 @@ simpleindex.py | |
.. literalinclude :: examples/simpleindex.py | |
:language: python | |
- :emphasize-lines: 12,15-18 | |
:linenos: | |
.. _simpleexpand: | |
@@ -28,7 +26,6 @@ simpleexpand.py | |
.. literalinclude :: examples/simpleexpand.py | |
:language: python | |
- :emphasize-lines: 12,15-18 | |
:linenos: | |
.. _simplematchdecider: | |
@@ -39,6 +36,5 @@ simplematchdecider.py | |
.. literalinclude :: examples/simplematchdecider.py | |
:language: python | |
- :emphasize-lines: 12,15-18 | |
:linenos: | |
diff --git a/xapian-bindings/python3/Makefile.am b/xapian-bindings/python3/Makefile.am | |
index 09a85c1..1b714bc 100755 | |
--- a/xapian-bindings/python3/Makefile.am | |
+++ b/xapian-bindings/python3/Makefile.am | |
@@ -142,7 +142,7 @@ CLEANFILES += modern/xapian_wrap.d $(stamp) | |
endif | |
MAINTAINERCLEANFILES = $(BUILT_SOURCES) | |
-exampledatadir = $(docdir)/python/examples | |
+exampledatadir = $(docdir)/python3/examples | |
dist_exampledata_DATA = \ | |
docs/examples/simpleindex.py \ | |
docs/examples/simpleexpand.py \ | |
@@ -152,8 +152,8 @@ dist_exampledata_DATA = \ | |
sphinxdocs = docs/html/index.html | |
install-data-local: $(sphinxdocs) | |
- $(mkinstalldirs) $(DESTDIR)$(docdir)/python | |
- cp -R -p docs/html $(DESTDIR)$(docdir)/python | |
+ $(mkinstalldirs) $(DESTDIR)$(docdir)/python3 | |
+ cp -R -p docs/html $(DESTDIR)$(docdir)/python3 | |
if DOCUMENTATION_RULES | |
all-local: $(sphinxdocs) | |
diff --git a/xapian-bindings/python3/docs/examples.rst b/xapian-bindings/python3/docs/examples.rst | |
index d1ee064..d2e2974 100644 | |
--- a/xapian-bindings/python3/docs/examples.rst | |
+++ b/xapian-bindings/python3/docs/examples.rst | |
@@ -8,7 +8,6 @@ simplesearch.py | |
.. literalinclude :: examples/simplesearch.py | |
:language: python | |
- :emphasize-lines: 12,15-18 | |
:linenos: | |
.. _simpleindex: | |
@@ -18,7 +17,6 @@ simpleindex.py | |
.. literalinclude :: examples/simpleindex.py | |
:language: python | |
- :emphasize-lines: 12,15-18 | |
:linenos: | |
.. _simpleexpand: | |
@@ -28,7 +26,6 @@ simpleexpand.py | |
.. literalinclude :: examples/simpleexpand.py | |
:language: python | |
- :emphasize-lines: 12,15-18 | |
:linenos: | |
.. _simplematchdecider: | |
@@ -39,6 +36,5 @@ simplematchdecider.py | |
.. literalinclude :: examples/simplematchdecider.py | |
:language: python | |
- :emphasize-lines: 12,15-18 | |
:linenos: | |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment