joshgoebel · aduh95 · Mar 17, 2021 · Mar 17, 2021 · Mar 17, 2021 · Mar 17, 2021
diff --git a/.eslintrc.js → .eslintrc.cjs b/.eslintrc.js → .eslintrc.cjs
diff --git a/.eslintrc.lang.js → .eslintrc.lang.cjs b/.eslintrc.lang.js → .eslintrc.lang.cjs
diff --git a/VERSION_11_UPGRADE.md b/VERSION_11_UPGRADE.md
@@ -0,0 +1,47 @@
+# Default Build Changes
+
+-  remove apache, http, nginx, properties, coffeescript from :common #2848
+
+### Feature Removal
+
+- HTML merging is now no longer included in core.  You'll want to use a plugin instead. https://github.com/highlightjs/highlight.js/issues/2889
+- fixMarkup is gone now, provide your own replacement #2534
+
+### Behavior changes
+
+- `initHighlighting` and `initHighlightingOnLoad` call `highlightAll`
+- Calling `highlightAll` over and over is not guarded against
+
+### Grammar's removed or renamed
+
+- remove the old htmlbars stub, use handlebars
+- remove c-like, use c, cpp, or arduino
+- removed `sql_more`, use `sql` instead
+
+### Visual / Themeing / CSS Changes
+
+- Default padding on `.hljs` is now 1em (up from 0.5em)
+- schoolbook no longer has a custom lined background, it's solid now
+
+### Alias Changes
+
+- php3,4,5,6,etc... aliases removed, use php instead
+- `zsh` removed, use `sh` instead
+- `freepascal`, `lazarus`, `lpr`, `lpm` removed. Use `delphi` or add you own aliases back.
+
+## API's changed
+
+- rename second_best to secondBest (highlightAuto)
+- highlightElement/highlightBlock result now no longer returns `re` key, use `relevance` instead
+- `CSS_NUMBER_MODE` has now been moved into the internal `css-shared` library
+- `highlight()` result now renames some keys to mark them as private: `_top`, `_emitter`, and `_illegalBy`
+
+### Configuration options removed/changed
+
+- useBR gone, #2559
+- tabReplace gone, #2874
+
+## Others
+
+- `relevance` returned may be a floating point number now
+- regex utility `join` renamed to `_eitherRewriteBackreferences` (this was always internal)
diff --git a/docs/api.rst b/docs/api.rst
@@ -42,17 +42,7 @@ Returns an object with the following properties:
 * ``language``: detected language
 * ``relevance``: integer value representing the relevance score
 * ``value``: HTML string with highlighting markup
-* ``second_best``: object with the same structure for second-best heuristically detected language (may be absent)
-
-
-``fixMarkup(value)`` (deprecated as of 10.3)
---------------------------------------------
-
-**fixMarkup is deprecated and will be removed entirely in v11.**
-
-Post-processing of the highlighted markup. Currently consists of replacing indentation TAB characters and using ``<br>`` tags instead of new-line characters. Options are set globally with ``configure``.
-
-Accepts a string with the highlighted markup.
+* ``secondBest``: object with the same structure for second-best heuristically detected language (may be absent)
 
 
 ``highlightBlock(block)``
@@ -73,8 +63,6 @@ in the ``class`` attribute of the DOM node. See the :doc:`class reference
 
 Configures global options:
 
-* ``tabReplace``: a string used to replace TAB characters in indentation.
-* ``useBR``: a flag to generate ``<br>`` tags instead of new-line characters in the output, useful when code is marked up using a non-``<pre>`` container.
 * ``classPrefix``: a string prefix added before class names in the generated markup, used for backwards compatibility with stylesheets.
 * ``languages``: an array of language names and aliases restricting auto detection to only these languages.
 * ``languageDetectRe``: a regex to configure how CSS class names map to language (allows class names like say `color-as-php` vs the default of `language-php`, etc.)
@@ -84,11 +72,12 @@ Accepts an object representing options with the values to updated. Other options
 ::
 
   hljs.configure({
-    tabReplace: '    ', // 4 spaces
+    noHighlightRe: /^do-not-highlightme$/i,
+    languageDetectRe: /\bgrammar-([\w-]+)\b/i, // for `grammar-swift` style CSS naming
     classPrefix: ''     // don't append class prefix
                         // … other options aren't changed
   });
-  hljs.initHighlighting();
+  hljs.highlightAll();
 
 
 ``highlightAll()``

diff --git a/docs/style-guide.rst b/docs/style-guide.rst
@@ -60,17 +60,6 @@ Okay to use:
 These may seem arbitrary at first but it's what has shown to make sense in
 practice.
 
-There's also a common set of rules that *has* to be defined for the root
-container verbatim:
-
-::
-
-  .hljs {
-    display: block;
-    overflow-x: auto;
-    padding: 0.5em;
-  }
-
 
 ``.subst``
 ----------