Fix some conflicts main

quarto-dev · Nov 24, 2024 · a9b1760 · a9b1760
1 parent be9e271
commit a9b1760
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/docs/authoring/tables.qmd b/docs/authoring/tables.qmd
@@ -589,6 +589,7 @@ Markdown supports specification of alignment by column, but does not allow setti
 
 It's possible that Quarto's processing of HTML tables may interfere with the HTML produced computationally with table packages in R and Python (or other supported languages).
 
+
 When you disable Quarto's HTML table processing, tables are not translated to Markdown, will not be rendered to other output formats, and can not use Quarto Markdown features, like cross-references, shortcodes, etc.
 The tables also won't be visible to Lua filters that act on `Table` nodes.
 

diff --git a/docs/presentations/revealjs/presenting.qmd b/docs/presentations/revealjs/presenting.qmd
@@ -262,7 +262,7 @@ Note: This feature has been confirmed to work in [Google Chrome](https://google.
 To Print to PDF, do the following:
 
 1.  Toggle into Print View using the {{< kbd E >}} key (or using the [Navigation Menu](#navigation-menu))
-2.  Open the in-browser print dialog {{< kbd Ctrl+P mac=Command+P >}}.
+2.  Open the in-browser print dialog {{< kbd Ctrl+P win=Ctrl+P mac=Command+P >}}.
 3.  Change the **Destination** setting to **Save as PDF**.
 4.  Change the **Layout** to **Landscape**.
 5.  Change the **Margins** to **None**.
Original file line number	Diff line number	Diff line change
Expand Up		@@ -589,6 +589,7 @@ Markdown supports specification of alignment by column, but does not allow setti

		It's possible that Quarto's processing of HTML tables may interfere with the HTML produced computationally with table packages in R and Python (or other supported languages).


		When you disable Quarto's HTML table processing, tables are not translated to Markdown, will not be rendered to other output formats, and can not use Quarto Markdown features, like cross-references, shortcodes, etc.
		The tables also won't be visible to Lua filters that act on `Table` nodes.

Expand Down