Merge branch 'master' of github.com:doxygen/doxygen

6 files changed, 11 insertions, 11 deletions

diff --git a/doc/commands.doc b/doc/commands.doc
index 2e51d79..a630aac 100644
--- a/doc/commands.doc
+++ b/doc/commands.doc
@@ -2157,7 +2157,7 @@ Commands for displaying examples
                \ref cmdinclude "\\include".
 
 </p><hr>
-\section cmdinclude[{lineno|doc}] \\include <file-name>
+\section cmdinclude \\include[{lineno|doc}] <file-name>
 
   \addindex \\include
   This command can be used to include a source file as a block of code.
@@ -2210,8 +2210,8 @@ Commands for displaying examples
 \section cmdincludelineno \\includelineno <file-name>
 
   \addindex \\includelineno
-  This command works the same way as \ref cmdinclude "\\include", but will add line
-  numbers to the included file.
+  This command is obsolete and is still supported for backward compatibility reasons,
+  it works the same way as \ref cmdinclude "\\include{lineno}"
 
   \sa sections \ref cmdinclude "\\include{lineno}".
 
@@ -2222,7 +2222,7 @@ Commands for displaying examples
   This command is obsolete and is still supported for backward compatibility reasons,
   it works the same way as \ref cmdinclude "\\include{doc}"
 
-  \sa section \ref cmdinclude "\\include".
+  \sa section \ref cmdinclude "\\include{doc}".
 
 <hr>
 \section cmdline \\line ( pattern )
diff --git a/doc/doxygen.1 b/doc/doxygen.1
index 1deb7b6..5ac287e 100644
--- a/doc/doxygen.1
+++ b/doc/doxygen.1
@@ -3,7 +3,7 @@
 doxygen \- documentation system for various programming languages
 .SH DESCRIPTION
 Doxygen is a documentation system for C++, C, Java, Objective-C, IDL
-(Corba and Microsoft flavors) and to some extent PHP, C#, and D.
+(Corba and Microsoft flavors), Fortran, Python, VHDL and to some extent PHP, C#, and D.
 .PP
 You can use doxygen in a number of ways:
 .TP
@@ -25,7 +25,7 @@ If - is used for configName doxygen will read from standard input.
 .TP
 4) Use doxygen to generate a template file controlling the layout of the generated documentation:
 .IP
-doxygen -l layoutFileName.xml
+doxygen -l [layoutFileName.xml]
 .TP
 5) Use doxygen to generate a template style sheet file for RTF, HTML or Latex.
 .TP
diff --git a/doc/doxyindexer.1 b/doc/doxyindexer.1
index ae4b282..b0d46d0 100644
--- a/doc/doxyindexer.1
+++ b/doc/doxyindexer.1
@@ -3,7 +3,7 @@
 doxyindexer \- creates a search index from raw search data
 .SH SYNOPSIS
 .B doxyindexer
-[\fI-o output_dir\fR] \fIsearchdata.xml \fR[\fIsearchdata2.xml\fR...] ]
+[\fI-o output_dir\fR] \fIsearchdata.xml \fR[\fIsearchdata2.xml\fR...]
 .SH DESCRIPTION
 Generates a search index called \fBdoxysearch.db\fR from one or more
 search data files produced by doxygen. Use
diff --git a/doc/doxysearch.1 b/doc/doxysearch.1
index a00124f..a26107b 100644
--- a/doc/doxysearch.1
+++ b/doc/doxysearch.1
@@ -2,10 +2,10 @@
 .SH NAME
 doxysearch.cgi \- search engine used for searching in doxygen documentation.
 .SH SYNOPSIS
-.B doxyindexer.cgi
+.B doxysearch.cgi
 .SH DESCRIPTION
 CGI binary that is used by doxygen generated HTML output to search for words. 
 The tool uses the search index called \fBdoxysearch.db\fR produced by 
 doxyindexer. 
 .SH SEE ALSO
-doxygen(1), doxysearch(1), doxywizard(1).
+doxygen(1), doxyindexer(1), doxywizard(1).
diff --git a/src/plantuml.cpp b/src/plantuml.cpp
index 89e6e9e..ada035b 100644
--- a/src/plantuml.cpp
+++ b/src/plantuml.cpp
@@ -47,7 +47,7 @@ QCString writePlantUMLSource(const QCString &outDir,const QCString &fileName,con
   }
   QCString text = "@startuml\n";
   text+=content;
-  text+="@enduml\n";
+  text+="\n@enduml\n";
   file.writeBlock( text, text.length() );
   file.close();
   return baseName;
diff --git a/templates/html/navtree.css b/templates/html/navtree.css
index 7d1cb67..81c54c2 100644
--- a/templates/html/navtree.css
+++ b/templates/html/navtree.css
@@ -96,7 +96,7 @@
 .ui-resizable-e {
   background-image:url("splitbar.png");
   background-size:100%;
-  background-repeat:no-repeat;
+  background-repeat:repeat-y;
   background-attachment: scroll;
   cursor:ew-resize;
   height:100%;