Merge commit '1054ea1bc5b07a1438a18c1b33f4266b28ff9d77'

diff --combined packages/gnome-c-style/README.md
index 336a4629fc0597b6a0f02568e3a5c4a4cb9d86be,86b79a79a204d9be4a47836c83dcfabddfc5704f..86b79a79a204d9be4a47836c83dcfabddfc5704f
--- 1/packages/gnome-c-style/README.md
--- 2/README.md
+++ b/packages/gnome-c-style/README.md
@@@ -1,24 -1,15 +1,15 @@@
  gnome-c-style
  ======
  
- In the C coding style commonly used in GNOME, identifiers are written
- in camel case and function arguments are aligned to the right end.
- That makes it a bit cumbersome to keep your code consistent with the
- style, even with align.el or plugins like yasnippet.
- 
- gnome-c-style is an Emacs minor mode intended to help editing C
- source code in that style.  It mainly provides two features: text
- alignment and snippet insersion.
+ gnome-c-style is an Emacs minor mode for editing C source code in [GNOME C coding style](https://developer.gnome.org/programming-guidelines/stable/c-coding-style.html.en).  In particular, it is useful to properly line-up [function arguments](https://developer.gnome.org/programming-guidelines/stable/c-coding-style.html.en#functions) and [function declarations in header files](https://developer.gnome.org/programming-guidelines/stable/c-coding-style.html.en#functions).
  
  Install
  ------
  
- * Type "make"
- * Copy .elc files somewhere in your load-path
+ * M-x package-install gnome-c-style
  * Add the following lines to ~/.emacs/init.el:
  
  ```
- (autoload 'gnome-c-style-mode "gnome-c-style" "GNOME-style C minor mode" t)
  (add-hook 'c-mode-hook 'gnome-c-style-mode)
  ```
  

diff --combined packages/gnome-c-style/gnome-c-style.el
index b7615d75e3ebfca3a0fc3308db275497584daf68,66c657839ee7af95e1a882a8dc11d6fb868e8498..66c657839ee7af95e1a882a8dc11d6fb868e8498
--- 1/packages/gnome-c-style/gnome-c-style.el
--- 2/gnome-c-style.el
+++ b/packages/gnome-c-style/gnome-c-style.el
@@@ -30,10 -30,10 +30,10 @@@
  ;; <https://developer.gnome.org/programming-guidelines/stable/c-coding-style.html.en#functions>
  ;;
  ;; It basically provides two functions: code alignment and snippet
- ;; insertion.  To align code, use `gnome-c-style-align-region' to
- ;; line-up multiple function declarations in region, and
- ;; `gnome-c-style-align-at-point' to line-up arguments in the argument
- ;; list at point.
+ ;; insertion.  To align code, use `gnome-c-style-align-decls-region'
+ ;; to line-up multiple function declarations in region, and
+ ;; `gnome-c-style-align-arglist-at-point' to line-up arguments in the
+ ;; argument list at point.
  ;;
  ;; To insert code snippet, use `gnome-c-snippet-insert'.  The command
  ;; will let you choose a template to be inserted.  This package also