Merge branch 'develop' into t/10194/public/ticket/10194

Resolved Conflicts in:
	src/doc/en/reference/structure/index.rst
	src/sage/misc/sagedoc.py

.gitignore

@@ -4,6 +4,7 @@
 /local
 /logs
 /upstream
+/src/mac-app/build
 
 #############################
 # Autotools generated files #
@@ -29,7 +30,9 @@
 .\#*
 
 # Vim
-*.s[a-w][a-z]
+*.swp
+*.swo
+*.swn
 *.un~
 .netrwhist
 
@@ -68,3 +71,10 @@ $RECYCLE.BIN/
 
 # SublimeText
 *.sublime-workspace
+
+#################
+# SageMathCloud #
+#################
+*.sage-chat
+*.sage-history
+*.syncdoc*

COPYING.txt

@@ -30,10 +30,12 @@ SOFTWARE                    LICENSE
 -----------------------------------------------------------------------
 atlas                       Modified BSD
 boehm_gc                    MIT-like license (see below)
+backports_ssl_match_hostname  Python License
 boost_cropped               Boost Software License (see below)
 bzip2                       BSD-ish (see below)
 cddlib                      GPLv2+
 cephes                      "may be used freely" (see below)
+certifi                     ISC
 cliquer                     GPLv2+
 conway_polynomials          None (database)
 cvxopt                      GPLv2+
@@ -52,9 +54,8 @@ freetype                    FreeType License (similar to BSD; see below)
 gap                         GPLv2+
 gcc                         GPLv3+
 gd                          Custom (BSD-ish)
-gdmodule                    Custom (BSD-ish)
 genus2reduction             GPLv2+
-gfan                        GPLv2+
+gfan                        GPLv2 or GPLv3
 gf2x                        GPLv2+
 givaro                      CeCILL-B (BSD-ish)
 glpk                        GPLv3+
@@ -65,6 +66,7 @@ iml                         COPYING is GPLv2, source files state modified BSD
 ipython                     Modified BSD
 jinja2                      Modified BSD
 jmol                        LGPLv2.1+
+jsonschema                  MIT License
 lcalc                       GPLv2+
 libfplll                    LGPLv2.1+
 libgap                      GPLv3+
@@ -73,9 +75,11 @@ linbox                      LGPLv2.1+
 lrcalc                      GPLv2+
 m4ri                        GPLv2+
 m4rie                       GPLv2+
+markupsafe                  Simplified BSD
+mathjax                     Apache License 2.0
 matplotlib                  Matplotlib License (BSD compatible, see below)
 maxima                      See below
-mercurial                   GPLv2+
+mistune                     Modified BSD
 mpc                         LGPLv3+
 mpfi                        COPYING is GPLv2, source files state LGPLv2.1+
 mpfr                        LGPLv3+
@@ -89,6 +93,7 @@ pari                        GPLv2+
 patch                       GPLv2+
 pexpect                     Python License
 pillow                      Apache License 2.0
+pip                         MIT License
 pkgconf                     ISC License (equivalent to Simplified BSD)
 pkgconfig                   MIT License
 polybori                    GPLv2+
@@ -117,13 +122,13 @@ setuptools                  Python License
 singular                    GPLv2 or GPLv3 (see below)
 six                         MIT License
 sphinx                      Modified BSD
-sqlalchemy                  MIT License
 sqlite                      Public Domain (see below)
 symmetrica                  MIT-like License (see below)
 sympow                      Modified BSD
 sympy                       Modified BSD
 tachyon                     Modified BSD
 termcap                     GPLv2+
+threejs                     MIT License
 tornado                     Apache License
 zlib                        Custom (Modified BSD)
 zn_poly                     GPLv2 or GPLv3 (no later versions, see below)
@@ -944,19 +949,6 @@ documentation.
 
 ================================================================================
 
-gdmodule:
-(http://newcenturycomputers.net/projects/gdmodule.html)
-
-Permission granted for unlimited use, provided that the Quest Center
-at Cold Spring Harbor Labs is given credit for the library in the
-user-visible documentation of your software. If you modify gd, we ask
-that you share the modifications with us so they can be added to the
-distribution. See gd.html for details.  (The rest of the notice is in
-the package gdmodule spkg, which is a bzip2'd tarball included in the
-Sage source distribution.)
-
-================================================================================
-
 genus2reduction:
 (http://www.math.u-bordeaux.fr/~liu/G2R/)
 Copyright Qing LIU. See PARI for the license terms.

Makefile

@@ -20,7 +20,7 @@ build: logs configure
 	"../$(PIPE)" \
 		"env SAGE_PARALLEL_SPKG_BUILD='$(SAGE_PARALLEL_SPKG_BUILD)' ./install all 2>&1" \
 		"tee -a ../logs/install.log"
-	./sage -b
+	+./sage -b
 
 # Preemptively download all standard upstream source tarballs.
 download:
@@ -59,6 +59,13 @@ doc: doc-html
 doc-html: build
 	$(PIPE) "./sage --docbuild --no-pdf-links all html $(SAGE_DOCBUILD_OPTS) 2>&1" "tee -a logs/dochtml.log"
 
+# 'doc-html-no-plot': build docs without building the graphics coming
+# from the '.. plot' directive, in case you want to save a few
+# megabytes of disk space. 'doc-clean' is a prerequisite because the
+# presence of graphics is cached in src/doc/output.
+doc-html-no-plot: build doc-clean
+	$(PIPE) "./sage --docbuild --no-pdf-links --no-plot all html $(SAGE_DOCBUILD_OPTS) 2>&1" "tee -a logs/dochtml.log"
+
 doc-html-mathjax: build
 	$(PIPE) "./sage --docbuild --no-pdf-links all html -j $(SAGE_DOCBUILD_OPTS) 2>&1" "tee -a logs/dochtml.log"
 

README.txt

@@ -64,7 +64,7 @@ QUICK INSTRUCTIONS TO BUILD FROM SOURCE
 
 The following steps briefly outline the process of building Sage from
 source. More detailed instructions, including how to build faster on
-multicore machines are contained later in this README and in the
+multicore machines, are contained later in this README and in the
 Installation Guide:
 
     http://www.sagemath.org/doc/installation

VERSION.txt

@@ -1 +1 @@
-Sage version 6.4.beta6, released 2014-10-14
+Sage version 6.7.beta4, released 2015-05-05