* doc/examples/accu-right-instanciation.cc: Rename as... * doc/examples/accu-right-instantiation.cc: ...this. * doc/examples/accu-wrong-instanciation.cc.raw, * doc/examples/split/accu-right-instanciation-1.cc.raw, * doc/outputs/accu-right-instanciation.txt: Likewise, rename as... * doc/examples/accu-wrong-instantiation.cc.raw, * doc/examples/split/accu-right-instantiation-1.cc.raw, * doc/outputs/accu-right-instantiation.txt: ...these. * doc/ref_guide/ref_guide.tex, * doc/programs-examples.mk, * doc/Makefile.am (MORE_EXAMPLES): s/instanciation/instantiation/. * doc/examples-outputs.mk, * doc/examples.mk, * doc/outputs.mk, * doc/split-examples.mk: Regen. --- milena/ChangeLog | 24 ++++++++++++++++++++ milena/doc/Makefile.am | 2 +- milena/doc/examples-outputs.mk | 14 +++++----- milena/doc/examples.mk | 2 +- ...nstanciation.cc => accu-right-instantiation.cc} | 0 ...tion.cc.raw => accu-wrong-instantiation.cc.raw} | 0 ...-1.cc.raw => accu-right-instantiation-1.cc.raw} | 0 milena/doc/outputs.mk | 2 +- ...tanciation.txt => accu-right-instantiation.txt} | 0 milena/doc/programs-examples.mk | 4 +- milena/doc/ref_guide/ref_guide.tex | 4 +- milena/doc/split-examples.mk | 10 ++++---- 12 files changed, 43 insertions(+), 19 deletions(-) rename milena/doc/examples/{accu-right-instanciation.cc => accu-right-instantiation.cc} (100%) rename milena/doc/examples/{accu-wrong-instanciation.cc.raw => accu-wrong-instantiation.cc.raw} (100%) rename milena/doc/examples/split/{accu-right-instanciation-1.cc.raw => accu-right-instantiation-1.cc.raw} (100%) rename milena/doc/outputs/{accu-right-instanciation.txt => accu-right-instantiation.txt} (100%) diff --git a/milena/ChangeLog b/milena/ChangeLog index 625a873..b853e0b 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,29 @@ 2010-03-18 Roland Levillain <roland@lrde.epita.fr> + Typo in doc/. + + * doc/examples/accu-right-instanciation.cc: Rename as... + * doc/examples/accu-right-instantiation.cc: ...this. + * doc/examples/accu-wrong-instanciation.cc.raw, + * doc/examples/split/accu-right-instanciation-1.cc.raw, + * doc/outputs/accu-right-instanciation.txt: + Likewise, rename as... + * doc/examples/accu-wrong-instantiation.cc.raw, + * doc/examples/split/accu-right-instantiation-1.cc.raw, + * doc/outputs/accu-right-instantiation.txt: + ...these. + * doc/ref_guide/ref_guide.tex, + * doc/programs-examples.mk, + * doc/Makefile.am (MORE_EXAMPLES): + s/instanciation/instantiation/. + * doc/examples-outputs.mk, + * doc/examples.mk, + * doc/outputs.mk, + * doc/split-examples.mk: + Regen. + +2010-03-18 Roland Levillain <roland@lrde.epita.fr> + Fix dependencies in doc/. * doc/Makefile.am (refman_dependencies): diff --git a/milena/doc/Makefile.am b/milena/doc/Makefile.am index 9bd9512..b8999bf 100644 --- a/milena/doc/Makefile.am +++ b/milena/doc/Makefile.am @@ -234,7 +234,7 @@ EXTRA_DIST += $(TECHNICAL_EXAMPLES) # Non generated examples. MORE_EXAMPLES = \ - examples/accu-wrong-instanciation.cc.raw \ + examples/accu-wrong-instantiation.cc.raw \ examples/fill-proto.cc.raw \ examples/ima2d-restricted-1.cc.raw \ examples/ima2d-restricted-2.cc.raw \ diff --git a/milena/doc/examples-outputs.mk b/milena/doc/examples-outputs.mk index b4b7c43..51bba63 100644 --- a/milena/doc/examples-outputs.mk +++ b/milena/doc/examples-outputs.mk @@ -1,17 +1,17 @@ ## Generated by gen-examples-outputs-mk. Do not edit by hand. -$(srcdir)/examples/accu-right-instanciation.stamp: examples/accu-right-instanciation.cc +$(srcdir)/examples/accu-right-instantiation.stamp: examples/accu-right-instantiation.cc @rm -f $@.tmp @touch $@.tmp - $(MAKE) $(AM_MAKEFLAGS) accu-right-instanciation$(EXEEXT) - ./accu-right-instanciation$(EXEEXT) >$(srcdir)/outputs/accu-right-instanciation.txt.tmp - mv $(srcdir)/outputs/accu-right-instanciation.txt.tmp $(srcdir)/outputs/accu-right-instanciation.txt + $(MAKE) $(AM_MAKEFLAGS) accu-right-instantiation$(EXEEXT) + ./accu-right-instantiation$(EXEEXT) >$(srcdir)/outputs/accu-right-instantiation.txt.tmp + mv $(srcdir)/outputs/accu-right-instantiation.txt.tmp $(srcdir)/outputs/accu-right-instantiation.txt @mv -f $@.tmp $@ -EXTRA_DIST += $(srcdir)/examples/accu-right-instanciation.stamp -MAINTAINERCLEANFILES += $(srcdir)/examples/accu-right-instanciation.stamp +EXTRA_DIST += $(srcdir)/examples/accu-right-instantiation.stamp +MAINTAINERCLEANFILES += $(srcdir)/examples/accu-right-instantiation.stamp -$(srcdir)/outputs/accu-right-instanciation.txt: $(srcdir)/examples/accu-right-instanciation.stamp +$(srcdir)/outputs/accu-right-instantiation.txt: $(srcdir)/examples/accu-right-instantiation.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ rm -f $<; \ diff --git a/milena/doc/examples.mk b/milena/doc/examples.mk index c30f111..c6542e4 100644 --- a/milena/doc/examples.mk +++ b/milena/doc/examples.mk @@ -1,7 +1,7 @@ ## Generated by gen-make-variable. Do not edit by hand. EXAMPLES = \ - $(srcdir)/examples/accu-right-instanciation.cc \ + $(srcdir)/examples/accu-right-instantiation.cc \ $(srcdir)/examples/borderthickness.cc \ $(srcdir)/examples/box2d-bbox.cc \ $(srcdir)/examples/domain-display.cc \ diff --git a/milena/doc/examples/accu-right-instanciation.cc b/milena/doc/examples/accu-right-instantiation.cc similarity index 100% rename from milena/doc/examples/accu-right-instanciation.cc rename to milena/doc/examples/accu-right-instantiation.cc diff --git a/milena/doc/examples/accu-wrong-instanciation.cc.raw b/milena/doc/examples/accu-wrong-instantiation.cc.raw similarity index 100% rename from milena/doc/examples/accu-wrong-instanciation.cc.raw rename to milena/doc/examples/accu-wrong-instantiation.cc.raw diff --git a/milena/doc/examples/split/accu-right-instanciation-1.cc.raw b/milena/doc/examples/split/accu-right-instantiation-1.cc.raw similarity index 100% rename from milena/doc/examples/split/accu-right-instanciation-1.cc.raw rename to milena/doc/examples/split/accu-right-instantiation-1.cc.raw diff --git a/milena/doc/outputs.mk b/milena/doc/outputs.mk index 5e60012..383f95a 100644 --- a/milena/doc/outputs.mk +++ b/milena/doc/outputs.mk @@ -1,7 +1,7 @@ ## Generated by gen-make-variable. Do not edit by hand. OUTPUTS = \ - $(srcdir)/outputs/accu-right-instanciation.txt \ + $(srcdir)/outputs/accu-right-instantiation.txt \ $(srcdir)/outputs/borderthickness.txt \ $(srcdir)/outputs/box2d-bbox.txt \ $(srcdir)/outputs/domain-display.txt \ diff --git a/milena/doc/outputs/accu-right-instanciation.txt b/milena/doc/outputs/accu-right-instantiation.txt similarity index 100% rename from milena/doc/outputs/accu-right-instanciation.txt rename to milena/doc/outputs/accu-right-instantiation.txt diff --git a/milena/doc/programs-examples.mk b/milena/doc/programs-examples.mk index 4a38dd3..6a81b02 100644 --- a/milena/doc/programs-examples.mk +++ b/milena/doc/programs-examples.mk @@ -25,7 +25,7 @@ ## If generated, merge examples-outputs.mk and outputs.mk? PROGRAMS_examples = \ - accu-right-instanciation \ + accu-right-instantiation \ borderthickness \ box2d-bbox \ domain-display \ @@ -89,7 +89,7 @@ PROGRAMS_examples += \ # `milena/doc/Makefile.am', since `examples/' is a subdirectory of # `milena/doc/'. Anyway, this file is to be eventually inlined in # `milena/doc/Makefile.am', so this is not a big deal. -accu_right_instanciation_SOURCES = examples/accu-right-instanciation.cc +accu_right_instantiation_SOURCES = examples/accu-right-instantiation.cc borderthickness_SOURCES = examples/borderthickness.cc box2d_bbox_SOURCES = examples/box2d-bbox.cc domain_display_SOURCES = examples/domain-display.cc diff --git a/milena/doc/ref_guide/ref_guide.tex b/milena/doc/ref_guide/ref_guide.tex index 29e6a7e..cdd5791 100644 --- a/milena/doc/ref_guide/ref_guide.tex +++ b/milena/doc/ref_guide/ref_guide.tex @@ -1492,9 +1492,9 @@ It exists two versions of each accumulator. \end{itemize} Note that when an accumulator is passed to \code{*::compute()}, it \must be instanciated.You cannot write: -\doxyrawcode{accu-wrong-instanciation} +\doxyrawcode{accu-wrong-instantiation} Instead, you \must write: -\doxycode{accu-right-instanciation} +\doxycode{accu-right-instantiation} \doxysubsection{exlblcompute}{Example with labeling::compute()} diff --git a/milena/doc/split-examples.mk b/milena/doc/split-examples.mk index ee61d74..37fd4e5 100644 --- a/milena/doc/split-examples.mk +++ b/milena/doc/split-examples.mk @@ -2,7 +2,7 @@ SPLIT_EXAMPLES = \ $(srcdir)/examples/split/ima-save-1.cc.raw \ - $(srcdir)/examples/split/accu-right-instanciation-1.cc.raw \ + $(srcdir)/examples/split/accu-right-instantiation-1.cc.raw \ $(srcdir)/examples/split/borderthickness-1.cc.raw \ $(srcdir)/examples/split/box2d-bbox-1.cc.raw \ $(srcdir)/examples/split/domain-display-1.cc.raw \ @@ -132,15 +132,15 @@ $(srcdir)/examples/split/ima-save-1.cc.raw: $(srcdir)/examples/split/ima-save.cc fi -$(srcdir)/examples/split/accu-right-instanciation.cc.stamp: $(srcdir)/examples/accu-right-instanciation.cc +$(srcdir)/examples/split/accu-right-instantiation.cc.stamp: $(srcdir)/examples/accu-right-instantiation.cc @rm -f $@.tmp @touch $@.tmp $(srcdir)/tools/split_sample.sh $< cc raw $(srcdir)/examples/split @mv -f $@.tmp $@ -EXTRA_DIST += $(srcdir)/examples/split/accu-right-instanciation.cc.stamp -MAINTAINERCLEANFILES += $(srcdir)/examples/split/accu-right-instanciation.cc.stamp +EXTRA_DIST += $(srcdir)/examples/split/accu-right-instantiation.cc.stamp +MAINTAINERCLEANFILES += $(srcdir)/examples/split/accu-right-instantiation.cc.stamp -$(srcdir)/examples/split/accu-right-instanciation-1.cc.raw: $(srcdir)/examples/split/accu-right-instanciation.cc.stamp +$(srcdir)/examples/split/accu-right-instantiation-1.cc.raw: $(srcdir)/examples/split/accu-right-instantiation.cc.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ rm -f $<; \ -- 1.5.6.5