Opened 11 years ago

Closed 11 years ago

#8203 closed defect (fixed)

misc doc fixes

Reported by: jhpalmieri Owned by: mvngu
Priority: minor Milestone: sage-4.3.3
Component: documentation Keywords:
Cc: Merged in: sage-4.3.3.alpha0
Authors: John Palmieri Reviewers: Marshall Hampton
Report Upstream: N/A Work issues:
Branch: Commit:
Dependencies: Stopgaps:

Status badges

Description

The attached patch fixes several warnings when building the documentation.

Attachments (1)

trac_8203-doc.patch (2.4 KB) - added by jhpalmieri 11 years ago.

Download all attachments as: .zip

Change History (5)

comment:1 follow-up: Changed 11 years ago by mvngu

  • Status changed from new to needs_work
  • Work issues set to rebase on top of #8190

The attachment trac_8203-doc.patch conflicts with the patch at #8190:

[mvngu@sage sage-main]$ pwd
/dev/shm/mvngu/sage-4.3.2-sage.math/devel/sage-main
[mvngu@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
[mvngu@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 trac_8203-doc.patch on top of #8190?

comment:2 in reply to: ↑ 1 Changed 11 years ago by jhpalmieri

  • Status changed from needs_work to needs_review

Replying to mvngu:

Do you want to rebase trac_8203-doc.patch on top of #8190?

Do I want to? Not really. But here's a new version of the patch.

By the way, can I add "delete SAGE_ROOT/devel/sage/doc/en/reference/sage/misc/attach.rst" to this ticket, since this didn't get done as part of #8022?

Changed 11 years ago by jhpalmieri

comment:3 Changed 11 years ago by mhampton

  • Status changed from needs_review to positive_review

Looks good to me, seems pretty simple and docs build OK. Positive review.

comment:4 Changed 11 years ago by mpatel

  • Merged in set to sage-4.3.3.alpha0
  • Resolution set to fixed
  • Reviewers set to Marshall Hampton
  • Status changed from positive_review to closed
  • Work issues rebase on top of #8190 deleted
Note: See TracTickets for help on using tickets.