#13260: Add tutorials and quickstarts from PREP workshops to standard
documentation
---------------------------------------+------------------------------------
Reporter: kcrisman | Owner: mvngu
Type: enhancement | Status: needs_review
Priority: major | Milestone: sage-5.3
Component: documentation | Resolution:
Keywords: | Work issues:
Report Upstream: N/A | Reviewers: André Apitzsch, Andrey
Novoseltsev, John Palmieri, Benjamin Jones
Authors: Karl-Dieter Crisman | Merged in:
Dependencies: | Stopgaps:
---------------------------------------+------------------------------------
Comment (by kcrisman):
Here's the non-image changes in the image patch. I accidentally changed
fixed these last two issues in that patch, shouldn't be a problem.
{{{
#! diff
diff --git a/MANIFEST.in b/MANIFEST.in
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -35,6 +35,7 @@
include doc/tr/a_tour_of_sage/sin_plot.png
graft doc/en/reference/media
graft doc/en/thematic_tutorials/media
+graft doc/en/prep/media
prune doc/en/reference/sage
prune doc/en/reference/sagenb
prune doc/output
diff --git a/doc/en/prep/Advanced-2DPlotting.rst b/doc/en/prep/Advanced-
2DPlotting.rst
--- a/doc/en/prep/Advanced-2DPlotting.rst
+++ b/doc/en/prep/Advanced-2DPlotting.rst
@@ -408,7 +408,7 @@
Here are the options for contour plots.
- They are given as an "attribute" \- no parentheses \- of the
- `contour_plot` object.
+ ``contour_plot`` object.
- They are given as a dictionary (see :ref:`the programming tutorial
<Advanced>`).
diff --git a/doc/en/prep/Programming.rst b/doc/en/prep/Programming.rst
--- a/doc/en/prep/Programming.rst
+++ b/doc/en/prep/Programming.rst
@@ -547,21 +547,17 @@
There *is* a way to get around this, but it unleashes a horde of
potential misuse. See the cells below if you are interested in this.
-.. skip
+ ::
+
+ sage: automatic_names(True) # not tested
+ sage: trig_expand((2*x + 4*y + sin(2*theta))^2) # not tested
+ 4*(sin(theta)*cos(theta) + x + 2*y)^2
+
+ This only works in the notebook. Now we'll turn it off.
::
- sage: automatic_names(True)
- sage: trig_expand((2*x + 4*y + sin(2*theta))^2)
- 4*(sin(theta)*cos(theta) + x + 2*y)^2
-
- This only works in the notebook.
-
-.. skip
-
- ::
-
- sage: automatic_names(False)
+ sage: automatic_names(False) # not tested
Another related issue is that a few names are "reserved" by Python/Sage,
and which aren't allowed as variable names.
}}}
--
Ticket URL: <http://trac.sagemath.org/sage_trac/ticket/13260#comment:30>
Sage <http://www.sagemath.org>
Sage: Creating a Viable Open Source Alternative to Magma, Maple, Mathematica,
and MATLAB
--
You received this message because you are subscribed to the Google Groups
"sage-trac" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/sage-trac?hl=en.
