Skip to content

Commit 8d984d8

Browse files
committed
Merge remote-tracking branch 'mercury/3.1' into 3.1
* mercury/3.1: (202 commits) after merge fixes fix some issues after merging 2.7 into 2.8 fix another bug due to choosing the wrong branch Update some screenshots to wrap them with a browser window some minor tweaks fix bugs due to choosing the wrong base branch complete component cross references Updated the Global Composer Installation article Removing an index to forms - this seemed to cause big errors in how the index/breadcrumbs were built Switching wrong link order Remove mentions of (cook)book Remove mentions of (cook)book Fix build Fix build Remove mentions of cookbook/book making sure the getting started navigation is smooth Add file extension to SOAP article Rename cache/ to http_cache/ Correcting the "next" page to point to creating pages Rewords ...
2 parents e2c36a7 + 7ea1141 commit 8d984d8

File tree

536 files changed

+15767
-17459
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

536 files changed

+15767
-17459
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1-
/_build
1+
/_build/doctrees
2+
/_build/html
23
*.pyc

.travis.yml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,14 @@
11
language: python
22

3-
python: "2.7"
3+
python: 2.7
44

55
sudo: false
6-
76
cache:
8-
directories:
9-
- $HOME/.cache/pip
10-
- _build
7+
directories: [$HOME/.cache/pip]
118

129
install: pip install sphinx~=1.3.0 git+https://github.com/fabpot/sphinx-php.git
1310

14-
script: sphinx-build -nW -b html -d _build/doctrees . _build/html
11+
script: sphinx-build -nW -c _build/ -b html -d _build/doctrees . _build/html
1512

1613
branches:
1714
except:
File renamed without changes.

_theme/_templates/globaltoc.html renamed to _build/_theme/_templates/globaltoc.html

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<div class=submenu>
22
{% set menu = [
3-
('The Book', 'book/index'),
4-
('The Cookbook', 'cookbook/index'),
3+
('Home', 'index'),
54
('The Components', 'components/index'),
65
('The Best Practices', 'best_practices/index'),
76
('The Quick Tour', 'quick_tour/index'),
File renamed without changes.

conf.py renamed to _build/conf.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575

7676
# List of patterns, relative to source directory, that match files and
7777
# directories to ignore when looking for source files.
78-
exclude_patterns = ['_theme']
78+
exclude_patterns = ['_build']
7979

8080
# The reST default role (used for this markup: `text`) to use for all documents.
8181
#default_role = None
@@ -279,4 +279,3 @@
279279

280280
# Use PHP syntax highlighting in code examples by default
281281
highlight_language='php'
282-

0 commit comments

Comments
 (0)