diff --git a/en_US.ISO8859-1/books/fdp-primer/Makefile b/en_US.ISO8859-1/books/fdp-primer/Makefile
index 46fdf9e30e..96a61ec00c 100644
--- a/en_US.ISO8859-1/books/fdp-primer/Makefile
+++ b/en_US.ISO8859-1/books/fdp-primer/Makefile
@@ -1,53 +1,54 @@
#
# $FreeBSD$
#
# Build the FreeBSD Documentation Project Primer.
#
MAINTAINER=doc@FreeBSD.org
DOC?= book
FORMATS?= html-split html
INSTALL_COMPRESSED?= gz
INSTALL_ONLY_COMPRESSED?=
#
# SRCS lists the individual XML files that make up the document. Changes
# to any of these files will force a rebuild
#
# XML content
SRCS= book.xml
SRCS+= overview/chapter.xml
SRCS+= tools/chapter.xml
SRCS+= working-copy/chapter.xml
SRCS+= structure/chapter.xml
SRCS+= doc-build/chapter.xml
SRCS+= the-website/chapter.xml
SRCS+= xml-primer/chapter.xml
SRCS+= xhtml-markup/chapter.xml
SRCS+= docbook-markup/chapter.xml
SRCS+= stylesheets/chapter.xml
SRCS+= translations/chapter.xml
SRCS+= writing-style/chapter.xml
SRCS+= psgml-mode/chapter.xml
+SRCS+= editor-config/chapter.xml
SRCS+= see-also/chapter.xml
SRCS+= examples/appendix.xml
# Images from the cross-document image library
IMAGES_LIB= callouts/1.png
IMAGES_LIB+= callouts/2.png
IMAGES_LIB+= callouts/3.png
IMAGES_LIB+= callouts/4.png
IMAGES_LIB+= callouts/5.png
# Entities
SRCS+= chapters.ent
URL_RELPREFIX?= ../../../..
DOC_PREFIX?= ${.CURDIR}/../../..
.include "${DOC_PREFIX}/share/mk/doc.project.mk"
diff --git a/en_US.ISO8859-1/books/fdp-primer/book.xml b/en_US.ISO8859-1/books/fdp-primer/book.xml
index 95eb2124f4..e1b42f5a90 100644
--- a/en_US.ISO8859-1/books/fdp-primer/book.xml
+++ b/en_US.ISO8859-1/books/fdp-primer/book.xml
@@ -1,271 +1,272 @@
%chapters;
]>
FreeBSD Documentation Project Primer for New
Contributors
The FreeBSD Documentation Project
1998
1999
2000
2001
2002
2003
2004
2005
2006
2007
2008
2009
2010
2011
2012
2013
DocEng
$FreeBSD$
$FreeBSD$
&legalnotice;
Thank you for becoming a part of the FreeBSD Documentation
Project. Your contribution is extremely valuable, and we
appreciate it.
This primer covers details needed
to start contributing to the FreeBSD Documentation
Project, or FDP, including tools, software,
and the philosophy behind the
Documentation Project.
This is a work in progress. Corrections and
additions are always welcome.
Preface
Shell Prompts
This table shows the default system prompt and
superuser prompt. The examples use these prompts to
indicate which type of user is running the example.
User
Prompt
Normal user
&prompt.user;
root
&prompt.root;
Typographic Conventions
This table describes the typographic conventions
used in this book.
Meaning
Examples
The names of commands.
Use ls -l to list all
files.
The names of files.
Edit .login.
On-screen computer output.
You have mail.
What the user types, contrasted with on-screen
computer output.
&prompt.user; date +"The time is %H:%M"
The time is 09:18
Manual page references.
Use &man.su.1; to change user identity.
User and group names.
Only root can do
this.
Emphasis.
The user must do
this.
Text that the user is expected to replace with
the actual text.
To search for a keyword in the manual pages, type
man -k
keyword
Environment variables.
$HOME is set to the user's home
directory.
Notes, Tips, Important Information, Warnings, and
Examples
Notes, warnings, and examples appear within the
text.
Notes are represented like this, and contain information
to take note of, as it may affect what the user
does.
Tips are represented like this, and contain information
helpful to the user, like showing an easier way to do
something.
Important information is represented like this.
Typically, these show extra steps the user may need to
take.
Warnings are represented like this, and contain
information warning about possible damage if the
instructions are not followed. This damage may be physical,
to the hardware or the user, or it may be non-physical, such
as the inadvertent deletion of important files.
A Sample Example
Examples are represented like this, and typically
contain examples showing a walkthrough, or
the results of a particular action.
Acknowledgments
My thanks to Sue Blake, Patrick Durusau, Jon Hamilton,
Peter Flynn, and Christopher Maden, who took the time to read
early drafts of this document and offer many valuable comments
and criticisms.
&chap.overview;
&chap.tools;
&chap.working-copy;
&chap.structure;
&chap.doc-build;
&chap.the-website;
&chap.xml-primer;
&chap.xhtml-markup;
&chap.docbook-markup;
&chap.stylesheets;
&chap.translations;
&chap.writing-style;
&chap.psgml-mode;
+ &chap.editor-config;
&chap.see-also;
&app.examples;
diff --git a/en_US.ISO8859-1/books/fdp-primer/chapters.ent b/en_US.ISO8859-1/books/fdp-primer/chapters.ent
index 088af94e23..8005f12f13 100644
--- a/en_US.ISO8859-1/books/fdp-primer/chapters.ent
+++ b/en_US.ISO8859-1/books/fdp-primer/chapters.ent
@@ -1,28 +1,29 @@
+
diff --git a/en_US.ISO8859-1/books/fdp-primer/editor-config/chapter.xml b/en_US.ISO8859-1/books/fdp-primer/editor-config/chapter.xml
new file mode 100644
index 0000000000..68e5c76ce5
--- /dev/null
+++ b/en_US.ISO8859-1/books/fdp-primer/editor-config/chapter.xml
@@ -0,0 +1,121 @@
+
+
+
+
+ Editor Configuration
+
+ Adjusting text editor configuration can make working on
+ document files quicker and easier, and help documents conform to
+ FDP guidelines.
+
+
+ <application>Vim</application>
+
+ Install from editors/vim
+ or editors/vim-lite.
+
+ Edit ~/.vimrc, adding these
+ lines:
+
+ augroup sgmledit
+ autocmd FileType sgml set formatoptions=cq2l " Special formatting options
+ autocmd FileType sgml set textwidth=70 " Wrap lines at 70 columns
+ autocmd FileType sgml set shiftwidth=2 " Automatically indent
+ autocmd FileType sgml set softtabstop=2 " Tab key indents 2 spaces
+ autocmd FileType sgml set tabstop=8 " Replace 8 spaces with a tab
+ autocmd FileType sgml set autoindent " Automatic indentation
+augroup END
+
+
+
+
+ <application>Emacs</application>
+
+ Install from
+ editors/emacs
+ or editors/xemacs.
+
+ Edit ~/.emacs, adding these
+ lines:
+
+ (defun local-sgml-mode-hook
+ (setq fill-column 70
+ indent-tabs-mode nil
+ next-line-add-newlines nil
+ standard-indent 4
+ sgml-indent-data t)
+ (auto-fill-mode t)
+ (setq sgml-catalog-files '("/usr/local/share/xml/catalog")))
+ (add-hook 'psgml-mode-hook
+ '(lambda () (local-psgml-mode-hook)))
+
+
+
+ <application>nano</application>
+
+ Install from
+ editors/nano or
+ editors/nano-devel.
+
+ Configuration:
+
+ &prompt.user; cp /usr/local/share/nano/xml.nanorc ~/.nanorc
+
+ Use printf to add lines to the
+ configuration file. Some have embedded Tab
+ characters, making this easier than editing the file
+ directly:
+
+ &prompt.user; printf '# trailing whitespace\n' >> ~/.nanorc
+&prompt.user; printf 'color ,blue "[[:space:]]+$"\n' >> ~/.nanorc
+&prompt.user; printf '# multiples of eight spaces at the start a line\n' >> ~/.nanorc
+&prompt.user; printf '# (after zero or more tabs) should be a tab\n' >> ~/.nanorc
+&prompt.user; printf 'color ,blue "^([\t]*[ ]{8})+"\n' >> ~/.nanorc
+&prompt.user; printf '# tabs after spaces\n' >> ~/.nanorc
+&prompt.user; printf 'color ,yellow "( )+\t"\n' >> ~/.nanorc
+&prompt.user; printf '# lines longer than 70 characters\n' >> ~/.nanorc
+&prompt.user; printf 'color ,red "^(([ ]{2})+|(\t+))*[ ]{1}[^ ]{1}"\n' >> ~/.nanorc
+
+ Specify additional helpful options when running the
+ editor.
+
+ &prompt.user; nano -AKipwz -r 70 -T8 chapter.xml
+
+ Users of &man.csh.1; can define an alias in
+ ~/.cshrc to automate these options:
+
+ alias nano "nano -AKipwz -r 70 -T8"
+
+ After the alias is defined, the options will be added
+ automatically:
+
+ &prompt.user; nano chapter.xml
+
+