#8203: misc doc fixes
--------------------------------------+-------------------------------------
Reporter: jhpalmieri | Owner: mvngu
Type: defect | Status: needs_work
Priority: minor | Milestone: sage-4.3.3
Component: documentation | Keywords:
Author: John Palmieri | Upstream: N/A
Reviewer: | Merged:
Work_issues: rebase on top of #8190 |
--------------------------------------+-------------------------------------
Changes (by mvngu):
* status: new => needs_work
* work_issues: => rebase on top of #8190
Comment:
The attachment
[http://trac.sagemath.org/sage_trac/attachment/ticket/8203/trac_8203-doc.patch
trac_8203-doc.patch] conflicts with the patch at #8190:
{{{
[mv...@sage sage-main]$ pwd
/dev/shm/mvngu/sage-4.3.2-sage.math/devel/sage-main
[mv...@sage sage-main]$ hg qimport http://trac.sagemath.org/sage_trac/raw-
attachment/ticket/8190/trac_8190-docbuild.patch && hg qpush
adding trac_8190-docbuild.patch to series file
applying trac_8190-docbuild.patch
now at: trac_8190-docbuild.patch
[mv...@sage sage-main]$ hg qimport http://trac.sagemath.org/sage_trac/raw-
attachment/ticket/8203/trac_8203-doc.patch && hg qpush
adding trac_8203-doc.patch to series file
applying trac_8203-doc.patch
patching file sage/gsl/ode.pyx
Hunk #1 FAILED at 205
1 out of 3 hunks FAILED -- saving rejects to file sage/gsl/ode.pyx.rej
patching file sage/rings/polynomial/multi_polynomial_ideal.py
Hunk #1 FAILED at 644
1 out of 1 hunks FAILED -- saving rejects to file
sage/rings/polynomial/multi_polynomial_ideal.py.rej
patching file sage/rings/quotient_ring.py
Hunk #1 FAILED at 527
1 out of 1 hunks FAILED -- saving rejects to file
sage/rings/quotient_ring.py.rej
patching file sage/schemes/elliptic_curves/ell_generic.py
Hunk #1 FAILED at 2155
1 out of 1 hunks FAILED -- saving rejects to file
sage/schemes/elliptic_curves/ell_generic.py.rej
patching file sage/symbolic/expression.pyx
Hunk #1 succeeded at 4978 with fuzz 2 (offset -957 lines).
patching file sage/symbolic/relation.py
Hunk #1 FAILED at 860
Hunk #2 FAILED at 925
Hunk #3 FAILED at 985
Hunk #4 FAILED at 1014
4 out of 4 hunks FAILED -- saving rejects to file
sage/symbolic/relation.py.rej
patch failed, unable to continue (try -v)
patch failed, rejects left in working dir
errors during apply, please fix and refresh trac_8203-doc.patch
}}}
Do you want to rebase
[http://trac.sagemath.org/sage_trac/attachment/ticket/8203/trac_8203-doc.patch
trac_8203-doc.patch] on top of #8190?
--
Ticket URL: <http://trac.sagemath.org/sage_trac/ticket/8203#comment:1>
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.
