# HG changeset patch # User Sandrine Ribeau # Date 1255976609 25200 # Node ID e9ce140c9065e45ea3fc7ad4ad6f3d4fc7cceade # Parent 07196bda2456db1a061b74744dd8f0c0df09623e [doc] remove toc.rst which is not used and conflicts with index.rst and fix table of contents numbering diff -r 07196bda2456 -r e9ce140c9065 doc/book/en/admin/index.rst --- a/doc/book/en/admin/index.rst Mon Oct 19 18:36:20 2009 +0200 +++ b/doc/book/en/admin/index.rst Mon Oct 19 11:23:29 2009 -0700 @@ -11,6 +11,7 @@ .. toctree:: :maxdepth: 1 + :numbered: setup create-instance @@ -20,8 +21,6 @@ ldap gae - - RQL logs -------- @@ -33,3 +32,4 @@ # web instance query log file query-log-file=/tmp/rql-myapp.log + diff -r 07196bda2456 -r e9ce140c9065 doc/book/en/admin/instance-config.rst --- a/doc/book/en/admin/instance-config.rst Mon Oct 19 18:36:20 2009 +0200 +++ b/doc/book/en/admin/instance-config.rst Mon Oct 19 11:23:29 2009 -0700 @@ -65,7 +65,7 @@ https-url = `https://localhost/demo` Setting up the web --------------------------------- +------------------ :`web.embed-allowed`: regular expression matching sites which could be "embedded" in the site (controllers 'embed') diff -r 07196bda2456 -r e9ce140c9065 doc/book/en/admin/setup.rst --- a/doc/book/en/admin/setup.rst Mon Oct 19 18:36:20 2009 +0200 +++ b/doc/book/en/admin/setup.rst Mon Oct 19 11:23:29 2009 -0700 @@ -2,7 +2,6 @@ .. _SetUpEnv: -=================================================== Installation and set-up of a *CubicWeb* environment =================================================== diff -r 07196bda2456 -r e9ce140c9065 doc/book/en/annexes/index.rst --- a/doc/book/en/annexes/index.rst Mon Oct 19 18:36:20 2009 +0200 +++ b/doc/book/en/annexes/index.rst Mon Oct 19 11:23:29 2009 -0700 @@ -10,6 +10,7 @@ .. toctree:: :maxdepth: 1 + :numbered: faq cookbook diff -r 07196bda2456 -r e9ce140c9065 doc/book/en/development/index.rst --- a/doc/book/en/development/index.rst Mon Oct 19 18:36:20 2009 +0200 +++ b/doc/book/en/development/index.rst Mon Oct 19 11:23:29 2009 -0700 @@ -8,6 +8,7 @@ .. toctree:: :maxdepth: 2 + :numbered: cubes/index datamodel/index diff -r 07196bda2456 -r e9ce140c9065 doc/book/en/intro/history.rst --- a/doc/book/en/intro/history.rst Mon Oct 19 18:36:20 2009 +0200 +++ b/doc/book/en/intro/history.rst Mon Oct 19 11:23:29 2009 -0700 @@ -1,7 +1,7 @@ .. -*- coding: utf-8 -*- A little history... -====================== +=================== *CubicWeb* is a semantic web application framework that Logilab_ started developing in 2001 as an offspring of its Narval_ research project. *CubicWeb* diff -r 07196bda2456 -r e9ce140c9065 doc/book/en/intro/index.rst --- a/doc/book/en/intro/index.rst Mon Oct 19 18:36:20 2009 +0200 +++ b/doc/book/en/intro/index.rst Mon Oct 19 11:23:29 2009 -0700 @@ -13,6 +13,7 @@ .. toctree:: :maxdepth: 2 + :numbered: book-map history diff -r 07196bda2456 -r e9ce140c9065 doc/book/en/toc.rst --- a/doc/book/en/toc.rst Mon Oct 19 18:36:20 2009 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,25 +0,0 @@ -.. -*- coding: utf-8 -*- - -.. _TOC: - -Table of contents -================= - - -.. toctree:: - :numbered: - - intro/concepts/index - development/cubes/index - development/datamodel/index - development/entityclasses/index - development/devcore/index - development/devweb/index - development/devrepo/index - development/testing/index - development/migration/index - development/webstdlib/index - admin/index - annexes/rql/index - annexes/index -