From c07c428498f6b2be1205e84285f184c9dc42aa8e Mon Sep 17 00:00:00 2001 From: Nathann Cohen Date: Sun, 11 Jan 2015 14:55:54 +0530 Subject: [PATCH 1/3] trac #17615: Move bordeaux_2008 into thematic_tutorials/explicit_methods_in_number_theory/ (and only that) --- .../explicit_methods_in_number_theory}/birch.png | Bin .../birds_eye_view.rst | 0 .../birds_other.rst | 0 .../explicit_methods_in_number_theory}/conf.py | 0 .../elliptic_curves.rst | 0 .../generators_for_rings.rst | 0 .../half_integral.rst | 0 .../explicit_methods_in_number_theory}/index.rst | 0 .../integer_factorization.rst | 0 .../introduction.rst | 0 .../explicit_methods_in_number_theory}/l_series.rst | 0 .../level_one_forms.rst | 0 .../method_of_graphs.rst | 0 .../explicit_methods_in_number_theory}/modabvar.rst | 0 .../modpcurve.png | Bin .../modular_forms.rst | 0 .../modular_forms_and_hecke_operators.rst | 0 .../modular_symbols.rst | 0 .../nf_galois_groups.rst | 0 .../nf_introduction.rst | 0 .../nf_orders.rst | 0 .../number_fields.rst | 0 22 files changed, 0 insertions(+), 0 deletions(-) rename src/doc/en/{bordeaux_2008 => thematic_tutorials/explicit_methods_in_number_theory}/birch.png (100%) rename src/doc/en/{bordeaux_2008 => thematic_tutorials/explicit_methods_in_number_theory}/birds_eye_view.rst (100%) rename src/doc/en/{bordeaux_2008 => thematic_tutorials/explicit_methods_in_number_theory}/birds_other.rst (100%) rename src/doc/en/{bordeaux_2008 => thematic_tutorials/explicit_methods_in_number_theory}/conf.py (100%) rename src/doc/en/{bordeaux_2008 => thematic_tutorials/explicit_methods_in_number_theory}/elliptic_curves.rst (100%) rename src/doc/en/{bordeaux_2008 => thematic_tutorials/explicit_methods_in_number_theory}/generators_for_rings.rst (100%) rename src/doc/en/{bordeaux_2008 => thematic_tutorials/explicit_methods_in_number_theory}/half_integral.rst (100%) rename src/doc/en/{bordeaux_2008 => thematic_tutorials/explicit_methods_in_number_theory}/index.rst (100%) rename src/doc/en/{bordeaux_2008 => thematic_tutorials/explicit_methods_in_number_theory}/integer_factorization.rst (100%) rename src/doc/en/{bordeaux_2008 => thematic_tutorials/explicit_methods_in_number_theory}/introduction.rst (100%) rename src/doc/en/{bordeaux_2008 => thematic_tutorials/explicit_methods_in_number_theory}/l_series.rst (100%) rename src/doc/en/{bordeaux_2008 => thematic_tutorials/explicit_methods_in_number_theory}/level_one_forms.rst (100%) rename src/doc/en/{bordeaux_2008 => thematic_tutorials/explicit_methods_in_number_theory}/method_of_graphs.rst (100%) rename src/doc/en/{bordeaux_2008 => thematic_tutorials/explicit_methods_in_number_theory}/modabvar.rst (100%) rename src/doc/en/{bordeaux_2008 => thematic_tutorials/explicit_methods_in_number_theory}/modpcurve.png (100%) rename src/doc/en/{bordeaux_2008 => thematic_tutorials/explicit_methods_in_number_theory}/modular_forms.rst (100%) rename src/doc/en/{bordeaux_2008 => thematic_tutorials/explicit_methods_in_number_theory}/modular_forms_and_hecke_operators.rst (100%) rename src/doc/en/{bordeaux_2008 => thematic_tutorials/explicit_methods_in_number_theory}/modular_symbols.rst (100%) rename src/doc/en/{bordeaux_2008 => thematic_tutorials/explicit_methods_in_number_theory}/nf_galois_groups.rst (100%) rename src/doc/en/{bordeaux_2008 => thematic_tutorials/explicit_methods_in_number_theory}/nf_introduction.rst (100%) rename src/doc/en/{bordeaux_2008 => thematic_tutorials/explicit_methods_in_number_theory}/nf_orders.rst (100%) rename src/doc/en/{bordeaux_2008 => thematic_tutorials/explicit_methods_in_number_theory}/number_fields.rst (100%) diff --git a/src/doc/en/bordeaux_2008/birch.png b/src/doc/en/thematic_tutorials/explicit_methods_in_number_theory/birch.png similarity index 100% rename from src/doc/en/bordeaux_2008/birch.png rename to src/doc/en/thematic_tutorials/explicit_methods_in_number_theory/birch.png diff --git a/src/doc/en/bordeaux_2008/birds_eye_view.rst b/src/doc/en/thematic_tutorials/explicit_methods_in_number_theory/birds_eye_view.rst similarity index 100% rename from src/doc/en/bordeaux_2008/birds_eye_view.rst rename to src/doc/en/thematic_tutorials/explicit_methods_in_number_theory/birds_eye_view.rst diff --git a/src/doc/en/bordeaux_2008/birds_other.rst b/src/doc/en/thematic_tutorials/explicit_methods_in_number_theory/birds_other.rst similarity index 100% rename from src/doc/en/bordeaux_2008/birds_other.rst rename to src/doc/en/thematic_tutorials/explicit_methods_in_number_theory/birds_other.rst diff --git a/src/doc/en/bordeaux_2008/conf.py b/src/doc/en/thematic_tutorials/explicit_methods_in_number_theory/conf.py similarity index 100% rename from src/doc/en/bordeaux_2008/conf.py rename to src/doc/en/thematic_tutorials/explicit_methods_in_number_theory/conf.py diff --git a/src/doc/en/bordeaux_2008/elliptic_curves.rst b/src/doc/en/thematic_tutorials/explicit_methods_in_number_theory/elliptic_curves.rst similarity index 100% rename from src/doc/en/bordeaux_2008/elliptic_curves.rst rename to src/doc/en/thematic_tutorials/explicit_methods_in_number_theory/elliptic_curves.rst diff --git a/src/doc/en/bordeaux_2008/generators_for_rings.rst b/src/doc/en/thematic_tutorials/explicit_methods_in_number_theory/generators_for_rings.rst similarity index 100% rename from src/doc/en/bordeaux_2008/generators_for_rings.rst rename to src/doc/en/thematic_tutorials/explicit_methods_in_number_theory/generators_for_rings.rst diff --git a/src/doc/en/bordeaux_2008/half_integral.rst b/src/doc/en/thematic_tutorials/explicit_methods_in_number_theory/half_integral.rst similarity index 100% rename from src/doc/en/bordeaux_2008/half_integral.rst rename to src/doc/en/thematic_tutorials/explicit_methods_in_number_theory/half_integral.rst diff --git a/src/doc/en/bordeaux_2008/index.rst b/src/doc/en/thematic_tutorials/explicit_methods_in_number_theory/index.rst similarity index 100% rename from src/doc/en/bordeaux_2008/index.rst rename to src/doc/en/thematic_tutorials/explicit_methods_in_number_theory/index.rst diff --git a/src/doc/en/bordeaux_2008/integer_factorization.rst b/src/doc/en/thematic_tutorials/explicit_methods_in_number_theory/integer_factorization.rst similarity index 100% rename from src/doc/en/bordeaux_2008/integer_factorization.rst rename to src/doc/en/thematic_tutorials/explicit_methods_in_number_theory/integer_factorization.rst diff --git a/src/doc/en/bordeaux_2008/introduction.rst b/src/doc/en/thematic_tutorials/explicit_methods_in_number_theory/introduction.rst similarity index 100% rename from src/doc/en/bordeaux_2008/introduction.rst rename to src/doc/en/thematic_tutorials/explicit_methods_in_number_theory/introduction.rst diff --git a/src/doc/en/bordeaux_2008/l_series.rst b/src/doc/en/thematic_tutorials/explicit_methods_in_number_theory/l_series.rst similarity index 100% rename from src/doc/en/bordeaux_2008/l_series.rst rename to src/doc/en/thematic_tutorials/explicit_methods_in_number_theory/l_series.rst diff --git a/src/doc/en/bordeaux_2008/level_one_forms.rst b/src/doc/en/thematic_tutorials/explicit_methods_in_number_theory/level_one_forms.rst similarity index 100% rename from src/doc/en/bordeaux_2008/level_one_forms.rst rename to src/doc/en/thematic_tutorials/explicit_methods_in_number_theory/level_one_forms.rst diff --git a/src/doc/en/bordeaux_2008/method_of_graphs.rst b/src/doc/en/thematic_tutorials/explicit_methods_in_number_theory/method_of_graphs.rst similarity index 100% rename from src/doc/en/bordeaux_2008/method_of_graphs.rst rename to src/doc/en/thematic_tutorials/explicit_methods_in_number_theory/method_of_graphs.rst diff --git a/src/doc/en/bordeaux_2008/modabvar.rst b/src/doc/en/thematic_tutorials/explicit_methods_in_number_theory/modabvar.rst similarity index 100% rename from src/doc/en/bordeaux_2008/modabvar.rst rename to src/doc/en/thematic_tutorials/explicit_methods_in_number_theory/modabvar.rst diff --git a/src/doc/en/bordeaux_2008/modpcurve.png b/src/doc/en/thematic_tutorials/explicit_methods_in_number_theory/modpcurve.png similarity index 100% rename from src/doc/en/bordeaux_2008/modpcurve.png rename to src/doc/en/thematic_tutorials/explicit_methods_in_number_theory/modpcurve.png diff --git a/src/doc/en/bordeaux_2008/modular_forms.rst b/src/doc/en/thematic_tutorials/explicit_methods_in_number_theory/modular_forms.rst similarity index 100% rename from src/doc/en/bordeaux_2008/modular_forms.rst rename to src/doc/en/thematic_tutorials/explicit_methods_in_number_theory/modular_forms.rst diff --git a/src/doc/en/bordeaux_2008/modular_forms_and_hecke_operators.rst b/src/doc/en/thematic_tutorials/explicit_methods_in_number_theory/modular_forms_and_hecke_operators.rst similarity index 100% rename from src/doc/en/bordeaux_2008/modular_forms_and_hecke_operators.rst rename to src/doc/en/thematic_tutorials/explicit_methods_in_number_theory/modular_forms_and_hecke_operators.rst diff --git a/src/doc/en/bordeaux_2008/modular_symbols.rst b/src/doc/en/thematic_tutorials/explicit_methods_in_number_theory/modular_symbols.rst similarity index 100% rename from src/doc/en/bordeaux_2008/modular_symbols.rst rename to src/doc/en/thematic_tutorials/explicit_methods_in_number_theory/modular_symbols.rst diff --git a/src/doc/en/bordeaux_2008/nf_galois_groups.rst b/src/doc/en/thematic_tutorials/explicit_methods_in_number_theory/nf_galois_groups.rst similarity index 100% rename from src/doc/en/bordeaux_2008/nf_galois_groups.rst rename to src/doc/en/thematic_tutorials/explicit_methods_in_number_theory/nf_galois_groups.rst diff --git a/src/doc/en/bordeaux_2008/nf_introduction.rst b/src/doc/en/thematic_tutorials/explicit_methods_in_number_theory/nf_introduction.rst similarity index 100% rename from src/doc/en/bordeaux_2008/nf_introduction.rst rename to src/doc/en/thematic_tutorials/explicit_methods_in_number_theory/nf_introduction.rst diff --git a/src/doc/en/bordeaux_2008/nf_orders.rst b/src/doc/en/thematic_tutorials/explicit_methods_in_number_theory/nf_orders.rst similarity index 100% rename from src/doc/en/bordeaux_2008/nf_orders.rst rename to src/doc/en/thematic_tutorials/explicit_methods_in_number_theory/nf_orders.rst diff --git a/src/doc/en/bordeaux_2008/number_fields.rst b/src/doc/en/thematic_tutorials/explicit_methods_in_number_theory/number_fields.rst similarity index 100% rename from src/doc/en/bordeaux_2008/number_fields.rst rename to src/doc/en/thematic_tutorials/explicit_methods_in_number_theory/number_fields.rst From 3c4d49938a34fe93c88c4c584247ac924c2d6166 Mon Sep 17 00:00:00 2001 From: Nathann Cohen Date: Sun, 11 Jan 2015 15:04:26 +0530 Subject: [PATCH 2/3] trac #17615: Update the links --- .../index.rst | 2 ++ src/doc/en/thematic_tutorials/index.rst | 1 + src/doc/en/thematic_tutorials/toctree.rst | 1 + src/doc/en/website/templates/index.html | 24 ------------------- 4 files changed, 4 insertions(+), 24 deletions(-) diff --git a/src/doc/en/thematic_tutorials/explicit_methods_in_number_theory/index.rst b/src/doc/en/thematic_tutorials/explicit_methods_in_number_theory/index.rst index ef6c3679d5e..a5f503c2cef 100644 --- a/src/doc/en/thematic_tutorials/explicit_methods_in_number_theory/index.rst +++ b/src/doc/en/thematic_tutorials/explicit_methods_in_number_theory/index.rst @@ -1,3 +1,5 @@ +.. _explicit_methods_in_number_theory: + Three Lectures about Explicit Methods in Number Theory Using Sage ================================================================= diff --git a/src/doc/en/thematic_tutorials/index.rst b/src/doc/en/thematic_tutorials/index.rst index fb732a34bed..6f76f09da38 100644 --- a/src/doc/en/thematic_tutorials/index.rst +++ b/src/doc/en/thematic_tutorials/index.rst @@ -55,6 +55,7 @@ Number Theory * :ref:`numtheory_rsa` * :ref:`sage.rings.padics.tutorial` +* :ref:`explicit_methods_in_number_theory` Coding Theory ------------- diff --git a/src/doc/en/thematic_tutorials/toctree.rst b/src/doc/en/thematic_tutorials/toctree.rst index df0aeb4ea21..795983fd507 100644 --- a/src/doc/en/thematic_tutorials/toctree.rst +++ b/src/doc/en/thematic_tutorials/toctree.rst @@ -20,3 +20,4 @@ Thematic tutorial document tree functional_programming coercion_and_categories numerical_sage/index + explicit_methods_in_number_theory/index diff --git a/src/doc/en/website/templates/index.html b/src/doc/en/website/templates/index.html index f3577e4d97c..4b94be6eb23 100644 --- a/src/doc/en/website/templates/index.html +++ b/src/doc/en/website/templates/index.html @@ -261,30 +261,6 @@

- - - - -

- - Three Lectures about Explicit Methods in Number Theory Using - Sage - - - - -
- - This document is about using the mathematics software Sage - to do computations with number fields and modular forms. It - assumes no prior knowledge about Sage, but assumes a - graduate level background in algebraic number theory. - -

- - - - {% endblock %} From e4f3206b52f470340e52eba5aee89ce6cbffc680 Mon Sep 17 00:00:00 2001 From: Nathann Cohen Date: Sun, 25 Jan 2015 10:56:19 +0100 Subject: [PATCH 3/3] trac #17615: Broken doctest --- src/sage/misc/sagedoc.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sage/misc/sagedoc.py b/src/sage/misc/sagedoc.py index 95c3b4d9773..ab678e6e97e 100644 --- a/src/sage/misc/sagedoc.py +++ b/src/sage/misc/sagedoc.py @@ -1036,7 +1036,7 @@ def search_doc(string, extra1='', extra2='', extra3='', extra4='', sage: len(search_doc('tree', interact=False).splitlines()) > 4000 # long time True - sage: len(search_doc('tree', whole_word=True, interact=False).splitlines()) < 1000 # long time + sage: len(search_doc('tree', whole_word=True, interact=False).splitlines()) < 2000 # long time True """ return _search_src_or_doc('doc', string, extra1=extra1, extra2=extra2,