Merge branch 'master' into 3.8.fp11

Makefile

@@ -50,156 +50,130 @@ help:
 
 .PHONY: clean
 clean:
-	cd apis/en && make clean
 	cd end-user/en && make clean
 	cd admin/en && make clean
 
 .PHONY: html
 html:
-	cd apis/en && make html
 	cd end-user/en && make html
 	cd admin/en && make html
 
 .PHONY: htmlwerror
 htmlwerror:
-	cd apis/en && make htmlwerror
 	cd end-user/en && make htmlwerror
 	cd admin/en && make htmlwerror
 
 .PHONY: dirhtml
 dirhtml:
-	cd apis/en && make dirhtml
 	cd end-user/en && make dirhtml
 	cd admin/en && make dirhtml
 
 .PHONY: singlehtml
 singlehtml:
-	cd apis/en && make singlehtml
 	cd end-user/en && make singlehtml
 	cd admin/en && make singlehtml
 
 .PHONY: pickle
 pickle:
-	cd apis/en && make pickle
 	cd end-user/en && make pickle
 	cd admin/en && make pickle
 
 .PHONY: json
 json:
-	cd apis/en && make json
 	cd end-user/en && make json
 	cd admin/en && make json
 
 .PHONY: htmlhelp
 htmlhelp:
-	cd apis/en && make htmlhelp
 	cd end-user/en && make htmlhelp
 	cd admin/en && make htmlhelp
 
 .PHONY: qthelp
 qthelp:
-	cd apis/en && make qthelp
 	cd end-user/en && make qthelp
 	cd admin/en && make qthelp
 
 .PHONY: applehelp
 applehelp:
-	cd apis/en && make applehelp
 	cd end-user/en && make applehelp
 	cd admin/en && make applehelp
 
 .PHONY: devhelp
 devhelp:
-	cd apis/en && make devhelp
 	cd end-user/en && make devhelp
 	cd admin/en && make devhelp
 
 .PHONY: epub
 epub:
-	cd apis/en && make epub
 	cd end-user/en && make epub
 	cd admin/en && make epub
 
 .PHONY: latex
 latex:
-	cd apis/en && make latex
 	cd end-user/en && make latex
 	cd admin/en && make latex
 
 .PHONY: latexpdf
 latexpdf:
-	cd apis/en && make latexpdf
 	cd end-user/en && make latexpdf
 	cd admin/en && make latexpdf
 
 .PHONY: latexpdfja
 latexpdfja:
-	cd apis/en && make latexpdfja
 	cd end-user/en && make latexpdfja
 	cd admin/en && make latexpdfja
 
 .PHONY: text
 text:
-	cd apis/en && make text
 	cd end-user/en && make text
 	cd admin/en && make text
 
 .PHONY: man
 man:
-	cd apis/en && make man
 	cd end-user/en && make man
 	cd admin/en && make man
 
 .PHONY: texinfo
 texinfo:
-	cd apis/en && make texinfo
 	cd end-user/en && make texinfo
 	cd admin/en && make texinfo
 
 .PHONY: info
 info:
-	cd apis/en && make info
 	cd end-user/en && make info
 	cd admin/en && make info
 
 .PHONY: gettext
 gettext:
-	cd apis/en && make gettext
 	cd end-user/en && make gettext
 	cd admin/en && make gettext
 
 .PHONY: changes
 changes:
-	cd apis/en && make changes
 	cd end-user/en && make changes
 	cd admin/en && make changes
 
 .PHONY: linkcheck
 linkcheck:
-	cd apis/en && make linkcheck
 	cd end-user/en && make linkcheck
 	cd admin/en && make linkcheck
 
 .PHONY: doctest
 doctest:
-	cd apis/en && make doctest
 	cd end-user/en && make doctest
 	cd admin/en && make doctest
 
 .PHONY: coverage
 coverage:
-	cd apis/en && make coverage
 	cd end-user/en && make coverage
 	cd admin/en && make coverage
 
 .PHONY: xml
 xml:
-	cd apis/en && make xml
 	cd end-user/en && make xml
 	cd admin/en && make xml
 
 .PHONY: pseudoxml
 pseudoxml:
-	cd apis/en && make pseudoxml
 	cd end-user/en && make pseudoxml
 	cd admin/en && make pseudoxml

README.md

@@ -25,7 +25,7 @@ The html files are in the build directory for each sub-project, for example, the
 
     $ open uforge-appcenter/build/html/index.html
 
-You can also build each guide individually, note though the end user guide and admin guide depend on the API guide.
+You can also build each guide individually.
 
 ### Building in a separate virtualenv
 
@@ -35,13 +35,11 @@ Launch the [venv.sh](blob/master/venv.sh) script to prepare the virtualenv or to
 
 Compile the docs with the `make-doc` function:
 
-    $ make-doc apis
     $ make-doc end-user
     $ make-doc admin
 
 Launch a local web server to view the compiled doc with the `serve-doc` function:
 
-    $ serve-doc apis
     $ serve-doc end-user
     $ serve-doc admin
 

admin/en/source/conf.py

@@ -38,12 +38,10 @@
 
 if on_rtd:
     extensions = [
-        'sphinx.ext.intersphinx',
         'sphinx.ext.todo',
     ]
 else:
     extensions = [
-        'sphinx.ext.intersphinx',
         'sphinx.ext.todo',
         'rst2pdf.pdfbuilder',
     ]
@@ -311,9 +309,6 @@ def setup(app):
 # If true, do not generate a @detailmenu in the "Top" node's menu.
 #texinfo_no_detailmenu = False
 
-# Refer to the APIs documentation.
-intersphinx_mapping = {'apis' : ('../../../../../apis/en/build/html/', '../../../apis/en/build/html/objects.inv')}
-
 # A comma-separated list of custom stylesheets.
 pdf_stylesheets = ['sphinx', 'kerning', 'a4', 'ja']