diff options
| author | Brian Coca <bcoca@users.noreply.github.com> | 2017-01-17 21:55:03 -0500 |
|---|---|---|
| committer | scottb <dharmabumstead@users.noreply.github.com> | 2017-01-17 18:55:03 -0800 |
| commit | 712be24a74df92de1d806bafb2bd5e30455a12a5 (patch) | |
| tree | 82f272844e6140a0db5c9585addd74a84c64493a /docs/docsite/Makefile | |
| parent | 082082857df2fe7338b534466ac49c24c8a4d69b (diff) | |
| download | ansible-712be24a74df92de1d806bafb2bd5e30455a12a5.tar.gz | |
Doc fixes (#20353)
* cleanup to reflect current builds
* consolidate templating docs and minor rewording
* new templating intro page
* fixed warnings as per feedback
* Update playbooks_filters.rst
Edited for clarity.
* Update playbooks_templating.rst
Light edits
Diffstat (limited to 'docs/docsite/Makefile')
| -rw-r--r-- | docs/docsite/Makefile | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/docs/docsite/Makefile b/docs/docsite/Makefile index 78b3616565..84625869a5 100644 --- a/docs/docsite/Makefile +++ b/docs/docsite/Makefile @@ -1,4 +1,4 @@ -SITELIB = $(shell python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()") +SITELIB = $(shell python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()"): FORMATTER=../../hacking/module_formatter.py DUMPER=../../hacking/dump_playbook_attributes.py ifeq ($(shell echo $(OS) | egrep -c 'Darwin|FreeBSD|OpenBSD|DragonFly'),1) @@ -7,22 +7,16 @@ else CPUS := $(shell nproc) endif -all: clean docs +all: docs -docs: clean directives modules htmldocs - -(cp *.ico htmlout/) - -(cp *.jpg htmlout/) - -(cp *.png htmlout/) - -variables: - (mkdir -p htmlout/) - dot variables.dot -Tpng -o htmlout/variables.png +docs: clean htmldocs htmldocs: directives modules staticmin CPUS=$(CPUS) $(MAKE) -f Makefile.sphinx html -webdocs: htmldocs +webdocs: docs +#TODO: leaving htmlout removal for those having older versions, should eventually be removed also clean: -rm -rf htmlout -rm -rf _build |