eschulte pushed a commit to branch master
in repository elpa.
commit 2c06e147b2600a30cc0c92903a9eb00c920b9d73
Author: Eric Schulte <schulte.e...@gmail.com>
Date: Fri Jan 10 18:51:56 2014 -0700
more tutorial
---
NOTES | 20 +++++++++++++-------
README | 2 +-
2 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/NOTES b/NOTES
index 8e72006..3316e99 100644
--- a/NOTES
+++ b/NOTES
@@ -133,11 +133,12 @@ This will be a pain, and will require expanding
[[info:emacs-gnutls]] to
add support for starting server processes, currently only client
processes are supported.
* Tutorials
-The following tutorials walk through common steps including installing
-and running instances of the Emacs web-server.
+The following tutorials walk through common usage scenarios including
+installing the Emacs web-server and running it behind a proxy.
-** Simple installation and execution
-The following instructions
+** Installation and running a server
+Installation should be as easy as updating the load path, and
+requiring =web-server=. More complete instructions are below.
1. Ensure that you have Emacs version 24 or greater installed.
@@ -164,15 +165,20 @@ The following instructions
optionally run =make= to compile the web-server code, and run =make
check= to test your web-server install.
+ #+begin_src sh
+ make
+ make check
+ #+end_src
+
4. From the root of the =emacs-web-server/= directory, start an
instance of Emacs with web-server loaded.
#+begin_src sh
- emacs -Q -L. -l web-server
+ emacs -Q -L . -l web-server
#+end_src
- Alternately, from an already running Emacs instance, add
- emacs-web-server to the load path and load the web server with the
+ Alternately, from an already running Emacs instance, add this
+ directory to the load path and load the web server with the
following.
#+begin_src emacs-lisp
diff --git a/README b/README
index 559b2cb..81e7f33 100644
--- a/README
+++ b/README
@@ -26,7 +26,7 @@ USAGE
[3] https://github.com/eschulte/org-ehtml
The tutorials page [4] walks through usage scenarios including
- installation and running the Emacs web-server behind a proxy.
+ installing the Emacs web-server and running it behind a proxy.
[4] http://eschulte.github.io/emacs-web-server/tutorials/
