1 files changed, 14 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 6ab81e395b..97c646dec3 100644
--- a/Makefile
+++ b/Makefile
@@ -178,6 +178,7 @@ modulepages:
 	PYTHONPATH=./lib $(PYTHON) hacking/module_formatter.py -A $(VERSION) -t man -o docs/man/man3/ --module-dir=library --template-dir=hacking/templates
 
 modulejson:
+<<<<<<< HEAD
 	mkdir -p docs/json
 	PYTHONPATH=./lib $(PYTHON) hacking/module_formatter.py -A $(VERSION) -t json -o docs/json --module-dir=library --template-dir=hacking/templates
 
@@ -190,6 +191,19 @@ modulejs:
 
 webdocs:
 	(cd docsite; make docs)
+=======
+	-(mkdir -p docs/json)
+	PYTHONPATH=./lib $(PYTHON) hacking/module_formatter.py -A $(VERSION) -t json -o docs/json --module-dir=library --template-dir=hacking/templates
+
+modulejs: modulejson
+	-(mkdir -p docs/json)
+	PYTHONPATH=./lib $(PYTHON) hacking/module_formatter.py -A $(VERSION) -t js -o docs/json --module-dir=library --template-dir=hacking/templates
+
+# because this requires Sphinx it is not run as part of every build, those building the RPM and so on can ignore this
+
+webdocs: 
+	(cd docsite/latest; make docs)
+>>>>>>> Docs on parameterized roles, make document generation output less noisy
 
 # just for quick testing of all the module docs
 webdocs2: