Fixed conflicts, added proper markup for code blocks + lexer info, and merged some synopsis and notes

Fixed conflicts between repositories and pushed changes related to using \`\`\` for code blocks in markdown files; added the proper lexer information for code blocks (i.e. \`\`\`cf3), which provides support for text hightlighting; and continued modifying markdown files by merging synopsis and notes sections, where appropriate.