summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhillip Lord <phillip.lord@russet.org.uk>2017-05-10 22:13:57 +0100
committerPhillip Lord <phillip.lord@russet.org.uk>2017-05-10 22:13:57 +0100
commit7812f5eff4f39377f051fcc37182af44bab3328e (patch)
treea4c4d4a50c6971146020c65c106bac852445dcec
parent353fc5fd4b92da03e203332dfdba57cea8272066 (diff)
downloademacs-feature/new-tutorial.tar.gz
-rw-r--r--etc/tutorials-org/images/frame-small.pngbin0 -> 11972 bytes
-rw-r--r--etc/tutorials-org/images/frame.pngbin0 -> 44411 bytes
-rw-r--r--etc/tutorials-org/tutorial.org19
3 files changed, 13 insertions, 6 deletions
diff --git a/etc/tutorials-org/images/frame-small.png b/etc/tutorials-org/images/frame-small.png
new file mode 100644
index 00000000000..32234ece5ef
--- /dev/null
+++ b/etc/tutorials-org/images/frame-small.png
Binary files differ
diff --git a/etc/tutorials-org/images/frame.png b/etc/tutorials-org/images/frame.png
new file mode 100644
index 00000000000..c334dbb9dea
--- /dev/null
+++ b/etc/tutorials-org/images/frame.png
Binary files differ
diff --git a/etc/tutorials-org/tutorial.org b/etc/tutorials-org/tutorial.org
index b3c94afd128..e8f463465e1 100644
--- a/etc/tutorials-org/tutorial.org
+++ b/etc/tutorials-org/tutorial.org
@@ -38,15 +38,22 @@ that this is the case here. One slight disadvantage of Emacs long
history is that some of its terminology predates windowing systems and
in one case conflicts with it. We describe these differences here.
+
+
** Frames
If you have just started Emacs and this tutorial, you will be looking
-at a single window showing this tutorial. In Emacs terminology, this
-is not a described as a window but as a /frame/. As with many
-applications, a single running Emacs can create any number of
-frames. We can do this using the menu system (we will investigate
-other ways later); try this now, but remember, these are /frames/ and
-not /windows/. Do not use the /New Window/ menu item, but instead:
+at a single window showing this tutorial.
+
+[[./images/frame-small.png]]
+
+
+In Emacs terminology, this is not a described as a window but as a
+/frame/. As with many applications, a single running Emacs can create
+any number of frames. We can do this using the menu system (we will
+investigate other ways later); try this now, but remember, these are
+/frames/ and not /windows/. Do not use the /New Window/ menu item, but
+instead:
#+begin_menu
File