Merge branch 'master' into feature/bug_fenced_code

1 files changed, 5 insertions, 9 deletions

diff --git a/src/docsets.cpp b/src/docsets.cpp
index 055532a..a838923 100644
--- a/src/docsets.cpp
+++ b/src/docsets.cpp
@@ -62,8 +62,7 @@ void DocSets::initialize()
   QFile makefile(mfName);
   if (!makefile.open(IO_WriteOnly))
   {
-    err("Could not open file %s for writing\n",mfName.data());
-    exit(1);
+    term("Could not open file %s for writing\n",mfName.data());
   }
   FTextStream ts(&makefile);
 
@@ -113,8 +112,7 @@ void DocSets::initialize()
   QFile plist(plName);
   if (!plist.open(IO_WriteOnly))
   {
-    err("Could not open file %s for writing\n",plName.data());
-    exit(1);
+    term("Could not open file %s for writing\n",plName.data());
   }
   FTextStream ts(&plist);
 
@@ -149,8 +147,7 @@ void DocSets::initialize()
   m_nf = new QFile(notes);
   if (!m_nf->open(IO_WriteOnly))
   {
-    err("Could not open file %s for writing\n",notes.data());
-    exit(1);
+    term("Could not open file %s for writing\n",notes.data());
   }
   //QCString indexName=Config_getBool(GENERATE_TREEVIEW)?"main":"index";
   QCString indexName="index";
@@ -170,8 +167,7 @@ void DocSets::initialize()
   m_tf = new QFile(tokens);
   if (!m_tf->open(IO_WriteOnly))
   {
-    err("Could not open file %s for writing\n",tokens.data());
-    exit(1);
+    term("Could not open file %s for writing\n",tokens.data());
   }
   m_tts.setDevice(m_tf);
   m_tts << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" << endl;
@@ -326,7 +322,7 @@ void DocSets::addIndexItem(const Definition *context,const MemberDef *md,
     case SrcLangExt_PHP:     lang="php"; break;        // PHP4/5
     case SrcLangExt_D:       lang="d"; break;          // D
     case SrcLangExt_Java:    lang="java"; break;       // Java
-    case SrcLangExt_JS:      lang="javascript"; break; // Javascript
+    case SrcLangExt_JS:      lang="javascript"; break; // JavaScript
     case SrcLangExt_Python:  lang="python"; break;     // Python
     case SrcLangExt_Fortran: lang="fortran"; break;    // Fortran
     case SrcLangExt_VHDL:    lang="vhdl"; break;       // VHDL