aboutsummaryrefslogtreecommitdiff
path: root/doc/sphinx
diff options
context:
space:
mode:
authorJim Fehrle2019-06-03 14:36:52 -0700
committerJim Fehrle2019-06-03 14:36:52 -0700
commit3b87df6b55d9c1ed4a8f32ff6195540f870d7e25 (patch)
tree16eb5c39436b6b03dce93d897786fddc9faa9aa3 /doc/sphinx
parent77fa4df223dc483ebf51fd34d82bb9d3d3405be4 (diff)
parenta18b1ae63e07cf7e174e3e8862ac32f00ce74865 (diff)
Merge branch 'master' of https://github.com/coq/coq
Diffstat (limited to 'doc/sphinx')
-rw-r--r--doc/sphinx/proof-engine/proof-handling.rst20
1 files changed, 4 insertions, 16 deletions
diff --git a/doc/sphinx/proof-engine/proof-handling.rst b/doc/sphinx/proof-engine/proof-handling.rst
index 3f966755ca..0cff987a27 100644
--- a/doc/sphinx/proof-engine/proof-handling.rst
+++ b/doc/sphinx/proof-engine/proof-handling.rst
@@ -535,19 +535,6 @@ Requesting information
eexists ?[n].
Show n.
- .. cmdv:: Show Script
- :name: Show Script
-
- Displays the whole list of tactics applied from the
- beginning of the current proof. This tactics script may contain some
- holes (subgoals not yet proved). They are printed under the form
-
- ``<Your Tactic Text here>``.
-
- .. deprecated:: 8.10
-
- Please use a text editor.
-
.. cmdv:: Show Proof
:name: Show Proof
@@ -705,9 +692,10 @@ command in CoqIDE. You can change the background colors shown for diffs from th
lets you control other attributes of the highlights, such as the foreground
color, bold, italic, underline and strikeout.
-Note: As of this writing (August 2018), Proof General will need minor changes
-to be able to show diffs correctly. We hope it will support this feature soon.
-See https://github.com/ProofGeneral/PG/issues/381 for the current status.
+As of June 2019, Proof General can also display Coq-generated proof diffs automatically.
+Please see the PG documentation section
+"`Showing Proof Diffs" <https://proofgeneral.github.io/doc/master/userman/Coq-Proof-General#Showing-Proof-Diffs>`_)
+for details.
How diffs are calculated
````````````````````````