Permalink
Browse files

minor #3773 modify Symfony CMF configuration values in the build proc…

…ess so that the... (xabbuh)

This PR was merged into the 2.3 branch.

Discussion
----------

modify Symfony CMF configuration values in the build process so that the...

...y match the Symfony documentation

| Q             | A
| ------------- | ---
| Doc fix?      | yes
| New docs?     | no
| Applies to    | all
| Fixed tickets |

Commits
-------

e78c7c4 modify Symfony CMF configuration values in the build process so that they match the Symfony documentation
  • Loading branch information...
weaverryan committed Apr 12, 2014
2 parents cfd6d7c + e78c7c4 commit 3d30b560db2a69d2f98d6ad2caf1ab29fecf9d94
Showing with 17 additions and 17 deletions.
  1. +4 −4 Makefile
  2. +8 −8 conf.py
  3. +1 −1 index.rst
  4. +4 −4 make.bat
@@ -77,17 +77,17 @@ qthelp:
@echo
@echo "Build finished; now you can run "qcollectiongenerator" with the" \
".qhcp project file in $(BUILDDIR)/qthelp, like this:"
@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/SymfonyCMF.qhcp"
@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/Symfony.qhcp"
@echo "To view the help file:"
@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/SymfonyCMF.qhc"
@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/Symfony.qhc"
devhelp:
$(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp
@echo
@echo "Build finished."
@echo "To view the help file:"
@echo "# mkdir -p $$HOME/.local/share/devhelp/SymfonyCMF"
@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/SymfonyCMF"
@echo "# mkdir -p $$HOME/.local/share/devhelp/Symfony"
@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/Symfony"
@echo "# devhelp"
epub:
16 conf.py
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
#
# Symfony CMF documentation build configuration file, created by
# Symfony documentation build configuration file, created by
# sphinx-quickstart on Sat Jul 28 21:58:57 2012.
#
# This file is execfile()d with the current directory set to its containing dir.
@@ -185,7 +185,7 @@
#html_file_suffix = None
# Output file base name for HTML help builder.
htmlhelp_basename = 'SymfonyCMFdoc'
htmlhelp_basename = 'SymfonyDoc'
# -- Options for LaTeX output --------------------------------------------------
@@ -204,8 +204,8 @@
# Grouping the document tree into LaTeX files. List of tuples
# (source start file, target name, title, author, documentclass [howto/manual]).
latex_documents = [
('index', 'SymfonyCMF.tex', u'Symfony CMF Documentation',
u'Symfony CMF community', 'manual'),
('index', 'Symfony.tex', u'Symfony Documentation',
u'Symfony community', 'manual'),
]
# The name of an image file (relative to this directory) to place at the top of
@@ -234,8 +234,8 @@
# One entry per manual page. List of tuples
# (source start file, name, description, authors, manual section).
man_pages = [
('index', 'symfonycmf', u'Symfony CMF Documentation',
[u'Symfony CMF community'], 1)
('index', 'symfony', u'Symfony Documentation',
[u'Symfony community'], 1)
]
# If true, show URL addresses after external links.
@@ -248,8 +248,8 @@
# (source start file, target name, title, author,
# dir menu entry, description, category)
texinfo_documents = [
('index', 'SymfonyCMF', u'Symfony CMF Documentation',
u'Symfony CMF community', 'SymfonyCMF', 'One line description of project.',
('index', 'Symfony', u'Symfony Documentation',
u'Symfony community', 'Symfony', 'One line description of project.',
'Miscellaneous'),
]
@@ -80,7 +80,7 @@ The Symfony Standard Edition comes with some bundles. Learn more about them:
CMF
---
The Symfony CMFproject makes it easier for developers to add CMS functionality
The Symfony CMF project makes it easier for developers to add CMS functionality
to applications built with the Symfony2 PHP framework.
.. toctree::
@@ -77,17 +77,17 @@ qthelp:
@echo
@echo "Build finished; now you can run "qcollectiongenerator" with the" \
".qhcp project file in $(BUILDDIR)/qthelp, like this:"
@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/SymfonyCMF.qhcp"
@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/Symfony.qhcp"
@echo "To view the help file:"
@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/SymfonyCMF.qhc"
@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/Symfony.qhc"
devhelp:
$(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp
@echo
@echo "Build finished."
@echo "To view the help file:"
@echo "# mkdir -p $$HOME/.local/share/devhelp/SymfonyCMF"
@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/SymfonyCMF"
@echo "# mkdir -p $$HOME/.local/share/devhelp/Symfony"
@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/Symfony"
@echo "# devhelp"
epub:

0 comments on commit 3d30b56

Please sign in to comment.