Change web target name to doc in various places

(cherry picked from commit d38bbdc0e395baa8df6e3d3ea35298ffaa248c21)

diff --git a/Documentation/user/compile.itely b/Documentation/user/compile.itely
index 4f9ac333a5a843201c6fda62bb6a38bd2d641669..9baee74282663cb691da71ce7238a4c3dc4ccaca 100644 (file)
--- a/Documentation/user/compile.itely
+++ b/Documentation/user/compile.itely
@@ -276,7 +276,7 @@ make WEB_TARGETS=online doc
 and both @q{offline} and @q{online} targets can be generated by issuing
 
 @example
-make WEB_TARGETS="offline online" web
+make WEB_TARGETS="offline online" doc
 @end example
 
 Several targets are available to clean the documentation build and
@@ -310,7 +310,7 @@ in @file{local.make} or on the command line to the number of
 a bi-processor or dual core machine
 
 @example
-make -j3 CPU_COUNT=3 web
+make -j3 CPU_COUNT=3 doc
 @end example
 
 @noindent
@@ -321,7 +321,7 @@ LilyPond instances.
 
 If source files have changed since last documentation build, output
 files that need to be rebuilt are normally rebuilt, even if you do not
-run @code{make web-clean} first.  However, building dependencies in the
+run @code{make doc-clean} first.  However, building dependencies in the
 documentation are so complex that rebuilding of some targets may not
 be triggered as they should be; a workaround is to force rebuilding
 by touching appropriate files, e.g.
@@ -353,7 +353,7 @@ development release of LilyPond will fail to build the docs.
 
 You may build the manual without building all the @file{input/*}
 stuff: change directory, for example to @file{Documentation/user},
-issue @code{make web}, which will build documentation in a
+issue @code{make doc}, which will build documentation in a
 subdirectory @file{out-www} from the source files in current
 directory.  In this case, if you also want to browse the documentation
 in its post-processed form, change back to top directory and issue

diff --git a/GNUmakefile.in b/GNUmakefile.in
index a45f4862086c21d8a30e3ccd7f9bc5e8fa128a63..d5480cf7b172056c7f2bb7ceb1a7befcaf768704 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -111,8 +111,8 @@ uninstall-WWW:
        $(MAKE) -C input/lsr uninstall
 
 
-# For online docs with content negotiation, issue `make web WEB_TARGETS=online'
-# For both online and offline docs, issue `make web WEB_TARGETS="offline online"'
+# For online docs with content negotiation, issue `make doc WEB_TARGETS=online'
+# For both online and offline docs, issue `make doc WEB_TARGETS="offline online"'
 WEB_TARGETS = offline
 
 WWW-post:

diff --git a/python/langdefs.py b/python/langdefs.py
index bfd8626ded7ff78d8ca889597df651c9accb87c1..0b673b4cf4e4ce618ac3b9b2431776e8223b028c 100644 (file)
--- a/python/langdefs.py
+++ b/python/langdefs.py
@@ -65,7 +65,7 @@ de = LanguageDef ('de', 'deutsch')
 # FIXME: should use localized name for ja
 ja = LanguageDef ('ja', 'japanese')
 # Outdated or broken translations may be disabled
-# (please run 'make web-clean' before doing that):
+# (please run 'make doc-clean' before doing that):
 #fr.enabled = False
 
 LANGUAGES = (site, fr, es, de, )#ja)

diff --git a/scm/to-xml.scm b/scm/to-xml.scm
index 82c563da6b33d72dffebcd559b604d13bbb05d12..7e2ba0caab794077f5d8e17b6b2ec07618f1d988 100644 (file)
--- a/scm/to-xml.scm
+++ b/scm/to-xml.scm
@@ -222,7 +222,7 @@ is then separated.
 (define-public (music-to-xml music port)
   "Dump XML-ish stuff to PORT."
 
-  ;; dtd contains # -- This confuses tex during make web.
+  ;; dtd contains # -- This confuses tex during make doc.
   ;;
   ;;  (display (dtd-header) port)
   
@@ -233,7 +233,7 @@ is then separated.
 (define-public (music-to-musicxml music port)
   "Dump MusicXML-ish stuff to PORT."
 
-  ;; dtd contains # -- This confuses tex during make web.
+  ;; dtd contains # -- This confuses tex during make doc.
   ;;
   ;;  (display (dtd-header) port)