Merge branch 'master' into rename-repo-url

highlightjs/highlightjs-7.5.0.d.ts

@@ -5,7 +5,7 @@
 
 declare module "highlight.js"
 {
-	module hljs
+	namespace hljs
 	{
 		export var LANGUAGES: { [name: string] : any; };
 
@@ -18,7 +18,7 @@ declare module "highlight.js"
 		export function fixMarkup(value: string, tabReplace: boolean, useBR: boolean) : string;
 
 		export function highlightBlock(block: Node, tabReplace?: boolean, useBR?: boolean) : void;
-		
+
 		export function initHighlighting(): void;
 		export function initHighlightingOnLoad(): void;
 

highlightjs/highlightjs.d.ts

@@ -7,7 +7,7 @@ declare module 'highlight.js' {
     export = hljs;
 }
 
-declare  module hljs
+declare  namespace hljs
 {
 	export function highlight(
 		name: string,