diff --git a/doc/org.texi b/doc/org.texi
index 37c575375..9b5a0e6dd 100644
--- a/doc/org.texi
+++ b/doc/org.texi
@@ -2608,7 +2608,7 @@ Specify whether the plot will be @code{2d}, @code{3d}, or @code{grid}.
 @item with
 Specify a @code{with} option to be inserted for every col being plotted
 (e.g. @code{lines}, @code{points}, @code{boxes}, @code{impulses}, etc...).
-Defaults to 'lines'.
+Defaults to @code{lines}.
 
 @item file
 If you want to plot to a file specify the @code{"path/to/desired/output-file"}.
@@ -2626,7 +2626,7 @@ flat mapping rather than a @code{3d} slope.
 
 @item timefmt
 Specify format of org-mode timestamps as they will be parsed by gnuplot.
-Defaults to '%Y-%m-%d-%H:%M:%S'.
+Defaults to @samp{%Y-%m-%d-%H:%M:%S}.
 
 @item script
 If you want total control you can specify a script file (place the file name
@@ -3304,7 +3304,7 @@ With this setup, the command @kbd{C-c C-t} will cycle an entry from TODO
 to FEEDBACK, then to VERIFY, and finally to DONE and DELEGATED.  You may
 also use a numeric prefix argument to quickly select a specific state.  For
 example @kbd{C-3 C-c C-t} will change the state immediately to VERIFY.
-Or you can use @kbd{S-left} to go backward through the sequence.  If you
+Or you can use @kbd{S-@key{left}} to go backward through the sequence.  If you
 define many keywords, you can use in-buffer completion
 (@pxref{Completion}) or even a special one-key selection scheme
 (@pxref{Fast access to TODO states}) to insert these words into the
@@ -6872,9 +6872,9 @@ Toggle the time grid on and off.  See also the variables
 @c
 @kindex r
 @item r
-Recreate the agenda buffer, for example to reflect the changes
-after modification of the time stamps of items with S-@key{left} and
-S-@key{right}.  When the buffer is the global TODO list, a prefix
+Recreate the agenda buffer, for example to reflect the changes after
+modification of the time stamps of items with @kbd{S-@key{left}} and
+@kbd{S-@key{right}}.  When the buffer is the global TODO list, a prefix
 argument is interpreted to create a selective list for a specific TODO
 keyword.
 @kindex g