From: Ulya Trofimovich <skvadrik@gmail.com>
Date: Sat, 26 Aug 2017 19:31:24 +0000 (+0100)
Subject: Synced with master.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6d44ecc3d8cbce8062fe06baa48c8e101038c011;p=re2c

Synced with master.
---

diff --git a/src/about/about.rst b/src/about/about.rst
index 0294a888..bfc8edce 100644
--- a/src/about/about.rst
+++ b/src/about/about.rst
@@ -26,7 +26,7 @@ Below is the list of re2c contributors:
 many are mentioned by their nicknames and some may be missing.
 `Let me know <skvadrik@gmail.com>`_ if you feel that this list should be amended:
 
-.. include:: contributors.rst
+.. include:: ../manual/contributors.rst_
 
 License
 -------
diff --git a/src/about/contributors.rst b/src/about/contributors.rst
deleted file mode 100644
index 541be107..00000000
--- a/src/about/contributors.rst
+++ /dev/null
@@ -1,34 +0,0 @@
-Abs62,
-asmwarrior,
-Ben Smith,
-Brian Young,
-CRCinAU,
-Dan Nuffer,
-Derick Rethans,
-Dimitri John Ledkov,
-Eldar Zakirov,
-Emmanuel Mogenet,
-Hartmut Kaiser,
-jcfp,
-Jean-Claude Wippler,
-Jeff Trull,
-Jérôme Dumesnil,
-Jesse Buesking,
-joscherl,
-Julian Andres Klode,
-Marcus Boerger,
-Mike Gilbert,
-nuno-lopes,
-Oleksii Taran,
-paulmcq,
-Paulo Custodio,
-Perry E. Metzger,
-philippschaefer,
-Ross Burton,
-Rui Maciel,
-Ryan Mast,
-Samuel006,
-Sergei Trofimovich,
-sirzooro,
-Tim Kelly,
-Ulya Trofimovich
diff --git a/src/manual/syntax/syntax.rst b/src/manual/syntax/syntax.rst
index c0b6a80b..43d4abcf 100644
--- a/src/manual/syntax/syntax.rst
+++ b/src/manual/syntax/syntax.rst
@@ -5,33 +5,17 @@ Syntax
 .. toctree::
     :hidden:
 
-Code for ``re2c`` consists of a set of `rules`_, `definitions`_ and
-`configurations`_.
+Code for ``re2c`` consists of a set of `rules`_, `definitions`_ and `configurations`_.
 
 Rules
 ----------
 
-Each rule consist of a `regular expressions`_ accompanied with a block of C/C++ code
-which is to be executed when the associated regular expression is
-matched. You can either start the code with an opening curly brace or
-the sequence ``:=``. If you use an opening curly brace, ``re2c`` will count brace depth
-and stop looking for code automatically. Otherwise, curly braces are not
-allowed and ``re2c`` stops looking for code at the first line that does
-not begin with whitespace. If two or more rules overlap, the first rule
-is preferred.
-
 .. include:: rules.rst_
 
 Definitions
 -----------
 
-Named definitions are of the form:
-
-    ``name = regular-expression;``
-
-If ``-F`` is active, then named definitions are also of the form:
-
-    ``name { regular-expression }``
+.. include:: named_definitions.rst_
 
 Configurations
 --------------
@@ -46,9 +30,4 @@ Regular expressions
 Interface
 ----------
 
-The user must supply interface code either in the form of C/C++ code
-(macros, functions, variables, etc.) or in the form of `configurations`_.
-Which symbols must be defined and which are optional
-depends on the particular use case.
-
 .. include:: interface.rst_