Browse Source

Merge pull request #1 from eska014/fix-char-refs

Fix character references
Rémi Verschelde 9 years ago
parent
commit
0c3972064c

+ 4 - 4
reference/binary_serialization_api.rst

@@ -333,7 +333,7 @@ This field is padded to 4 bytes.
 +----------+-------+-----------+-----------------------------------------------------------------------------------------+
 +----------+-------+-----------+-----------------------------------------------------------------------------------------+
 | Offset   | Len   | Type      | Description                                                                             |
 | Offset   | Len   | Type      | Description                                                                             |
 +==========+=======+===========+=========================================================================================+
 +==========+=======+===========+=========================================================================================+
-| 4        | 4     | Integer   | String Length, or New Format (val&0x80000000!=0 and NameCount=val&0x7FFFFFFF)   |
+| 4        | 4     | Integer   | String Length, or New Format (val&0x80000000!=0 and NameCount=val&0x7FFFFFFF)           |
 +----------+-------+-----------+-----------------------------------------------------------------------------------------+
 +----------+-------+-----------+-----------------------------------------------------------------------------------------+
 
 
 For old format:
 For old format:
@@ -355,7 +355,7 @@ For new format:
 +==========+=======+===========+=====================================+
 +==========+=======+===========+=====================================+
 | 4        | 4     | Integer   | Sub-Name Count                      |
 | 4        | 4     | Integer   | Sub-Name Count                      |
 +----------+-------+-----------+-------------------------------------+
 +----------+-------+-----------+-------------------------------------+
-| 8        | 4     | Integer   | Flags (absolute: val&1 != 0 )   |
+| 8        | 4     | Integer   | Flags (absolute: val&1 != 0 )       |
 +----------+-------+-----------+-------------------------------------+
 +----------+-------+-----------+-------------------------------------+
 
 
 For each Name and Sub-Name
 For each Name and Sub-Name
@@ -385,7 +385,7 @@ Every name string is is padded to 4 bytes.
 +----------+-------+-----------+---------------------------------------------------------------------+
 +----------+-------+-----------+---------------------------------------------------------------------+
 | Offset   | Len   | Type      | Description                                                         |
 | Offset   | Len   | Type      | Description                                                         |
 +==========+=======+===========+=====================================================================+
 +==========+=======+===========+=====================================================================+
-| 4        | 4     | Integer   | val&0x7FFFFFFF = elements, val&0x80000000 = shared (bool)   |
+| 4        | 4     | Integer   | val&0x7FFFFFFF = elements, val&0x80000000 = shared (bool)           |
 +----------+-------+-----------+---------------------------------------------------------------------+
 +----------+-------+-----------+---------------------------------------------------------------------+
 
 
 | Then what follows is, for amount of "elements", pairs of key and
 | Then what follows is, for amount of "elements", pairs of key and
@@ -398,7 +398,7 @@ Every name string is is padded to 4 bytes.
 +----------+-------+-----------+---------------------------------------------------------------------+
 +----------+-------+-----------+---------------------------------------------------------------------+
 | Offset   | Len   | Type      | Description                                                         |
 | Offset   | Len   | Type      | Description                                                         |
 +==========+=======+===========+=====================================================================+
 +==========+=======+===========+=====================================================================+
-| 4        | 4     | Integer   | val&0x7FFFFFFF = elements, val&0x80000000 = shared (bool)   |
+| 4        | 4     | Integer   | val&0x7FFFFFFF = elements, val&0x80000000 = shared (bool)           |
 +----------+-------+-----------+---------------------------------------------------------------------+
 +----------+-------+-----------+---------------------------------------------------------------------+
 
 
 | Then what follows is, for amount of "elements", values one after the
 | Then what follows is, for amount of "elements", values one after the

+ 4 - 4
reference/gdscript.rst

@@ -163,7 +163,7 @@ The following is the list of supported operators and their precedence
 +---------------------------------------------------------------+-----------------------------------------+
 +---------------------------------------------------------------+-----------------------------------------+
 | ``^``                                                         | Bitwise XOR                             |
 | ``^``                                                         | Bitwise XOR                             |
 +---------------------------------------------------------------+-----------------------------------------+
 +---------------------------------------------------------------+-----------------------------------------+
-| ``|``                                                    | Bitwise OR                              |
+| ``|``                                                         | Bitwise OR                              |
 +---------------------------------------------------------------+-----------------------------------------+
 +---------------------------------------------------------------+-----------------------------------------+
 | ``<`` ``>`` ``==`` ``!=`` ``>=`` ``<=``                       | Comparisons                             |
 | ``<`` ``>`` ``==`` ``!=`` ``>=`` ``<=``                       | Comparisons                             |
 +---------------------------------------------------------------+-----------------------------------------+
 +---------------------------------------------------------------+-----------------------------------------+
@@ -173,9 +173,9 @@ The following is the list of supported operators and their precedence
 +---------------------------------------------------------------+-----------------------------------------+
 +---------------------------------------------------------------+-----------------------------------------+
 | ``and`` ``&&``                                                | Boolean AND                             |
 | ``and`` ``&&``                                                | Boolean AND                             |
 +---------------------------------------------------------------+-----------------------------------------+
 +---------------------------------------------------------------+-----------------------------------------+
-| ``or`` ``&#124;&#124;``                                       | Boolean OR                              |
+| ``or`` ``||``                                                 | Boolean OR                              |
 +---------------------------------------------------------------+-----------------------------------------+
 +---------------------------------------------------------------+-----------------------------------------+
-| ``=`` ``+=`` ``-=`` ``*=`` ``/=`` ``%=`` ``&=`` ``&#124;=``   | Assignment, Lowest Priority             |
+| ``=`` ``+=`` ``-=`` ``*=`` ``/=`` ``%=`` ``&=`` ``|=``        | Assignment, Lowest Priority             |
 +---------------------------------------------------------------+-----------------------------------------+
 +---------------------------------------------------------------+-----------------------------------------+
 
 
 Literals
 Literals
@@ -194,7 +194,7 @@ Literals
 +--------------------------+--------------------------------+
 +--------------------------+--------------------------------+
 | ``"""Hello, Dude"""``    | Multiline string               |
 | ``"""Hello, Dude"""``    | Multiline string               |
 +--------------------------+--------------------------------+
 +--------------------------+--------------------------------+
-| ``&#64;"Node/Label"``    | NodePath or StringName         |
+| ``@"Node/Label"``        | NodePath or StringName         |
 +--------------------------+--------------------------------+
 +--------------------------+--------------------------------+
 
 
 Comments
 Comments

+ 1 - 1
reference/richtextlabel_bbcode.rst

@@ -48,7 +48,7 @@ Reference
 +-----------------+--------------------------------------------+--------------------------------------------------------------+
 +-----------------+--------------------------------------------+--------------------------------------------------------------+
 | **font**        | ``[font=<path>]{text}[/font]``             | Use custom font at for {text}.                               |
 | **font**        | ``[font=<path>]{text}[/font]``             | Use custom font at for {text}.                               |
 +-----------------+--------------------------------------------+--------------------------------------------------------------+
 +-----------------+--------------------------------------------+--------------------------------------------------------------+
-| **color**       | ``[color=&lt;code/name>]{text}[/color]``   | Change {text} color, use # format such as #ff00ff or name.   |
+| **color**       | ``[color=<code/name>]{text}[/color]``      | Change {text} color, use # format such as #ff00ff or name.   |
 +-----------------+--------------------------------------------+--------------------------------------------------------------+
 +-----------------+--------------------------------------------+--------------------------------------------------------------+
 
 
 Built-In Color Names
 Built-In Color Names

+ 1 - 1
tutorials/asset_pipeline/exporting_projects.rst

@@ -121,7 +121,7 @@ creates the package. There are 3 different modes for exporting:
    offers total control of what is exported. Individual resources can be
    offers total control of what is exported. Individual resources can be
    selected and dependency detection is performed to ensure that
    selected and dependency detection is performed to ensure that
    everything needed is added. As a plus, this mode allows to
    everything needed is added. As a plus, this mode allows to
-   "Bundle&quot; scenes and dependencies into a single file, which is
+   "Bundle" scenes and dependencies into a single file, which is
    *really* useful for games distributed on optical media.
    *really* useful for games distributed on optical media.
 
 
 .. image:: /img/expselected.png
 .. image:: /img/expselected.png