diff options
| author | Petr Prikryl <prikryl@atlas.cz> | 2014-07-29 07:09:52 (GMT) |
|---|---|---|
| committer | Petr Prikryl <prikryl@atlas.cz> | 2014-07-29 07:09:52 (GMT) |
| commit | e38b1f7685bfa4a301a96d09034dd940c2153aed (patch) | |
| tree | 3571bd0400ecd959bddd686ab1e92019b0808889 /doc | |
| parent | 1ccc93fd699b34b7a89acecf9e59a526a5972bb8 (diff) | |
| parent | c9d816aaf20c24c624407ba1c2eb4e00eff0c02f (diff) | |
| download | Doxygen-e38b1f7685bfa4a301a96d09034dd940c2153aed.zip Doxygen-e38b1f7685bfa4a301a96d09034dd940c2153aed.tar.gz Doxygen-e38b1f7685bfa4a301a96d09034dd940c2153aed.tar.bz2 | |
Merge branch 'master' of https://github.com/doxygen/doxygen.git
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/Makefile.in | 2 | ||||
| -rw-r--r-- | doc/docblocks.doc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/doc/Makefile.in b/doc/Makefile.in index 1f472e6..f0c3a03 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -17,7 +17,7 @@ all: language config.doc FORCE export DOXYGEN_DOCDIR; \ VERSION=$(VERSION) ; \ export VERSION; \ - $(DOXYGEN)/bin/doxygen + "$(DOXYGEN)/bin/doxygen" @rm -f ../latex/refman.tex @cp doxygen_logo*.gif ../html @cp Makefile.latex ../latex/Makefile diff --git a/doc/docblocks.doc b/doc/docblocks.doc index 6ef6bf0..c74211c 100644 --- a/doc/docblocks.doc +++ b/doc/docblocks.doc @@ -464,8 +464,8 @@ The parser tries to guess if the source code is fixed format Fortran or free format Fortran code. This may not always be correct. If not one should use \ref cfg_extension_mapping "EXTENSION_MAPPING" to correct this. By setting `EXTENSION_MAPPING = f=FortranFixed f90=FortranFree` files with -extension \c f90 are interpreted as fixed format Fortran code and files with -extension \c f are interpreted as free format Fortran code. +extension \c f are interpreted as fixed format Fortran code and files with +extension \c f90 are interpreted as free format Fortran code. For Fortran "!>" or "!<" starts a comment and "!!" or "!>" can be used to continue an one line comment into a multi-line comment. |