Skip to content
Snippets Groups Projects
Commit c6953ac2 authored by Pracheth S P's avatar Pracheth S P Committed by Allan Chappell
Browse files

Issue #3321397 by Pracheth: Replace README.txt with README.md

parent 2fe44004
Branches 7.x-2.x
No related tags found
1 merge request!1Updated README.txt to README.md
# User merge # USER MERGE
## Notes for version 2.x ## CONTENTS OF THE FILE
- Notes for version 2.x
- General changes
- Configuration page
- Integration with other modules
- Self-Serve User Merge
- Maintainers
## NOTES FOR VERSION 2.X
A new interface allows users with the right permissions to choose how each user A new interface allows users with the right permissions to choose how each user
property should be merged. This includes the ability to merge fields, property should be merged. This includes the ability to merge fields,
...@@ -8,7 +17,7 @@ referencing entities, and other entities owned by the selected users. This aims ...@@ -8,7 +17,7 @@ referencing entities, and other entities owned by the selected users. This aims
to provide a more finely tuned merge process, as well as to minimize errors and to provide a more finely tuned merge process, as well as to minimize errors and
information loss. information loss.
### General changes ## GENERAL CHANGES
`usermerge.module` provides only the API, and doesn't actually do any merging of `usermerge.module` provides only the API, and doesn't actually do any merging of
its own. It implements `hook_hook_info()`, so other modules can provide their its own. It implements `hook_hook_info()`, so other modules can provide their
...@@ -22,12 +31,13 @@ Core-specific functionality (default user properties, fields) is managed in ...@@ -22,12 +31,13 @@ Core-specific functionality (default user properties, fields) is managed in
`uid` column, and basic display support for non-default user properties that `uid` column, and basic display support for non-default user properties that
aren't structured like fields (such as `rdf_mapping`). aren't structured like fields (such as `rdf_mapping`).
### Configuration page ## CONFIGURATION PAGE
The configuration page is located at `admin/config/people/usermerge`, and allows The configuration page is located at `admin/config/people/usermerge`, and allows
admins to select which core properties of the user entity should be exposed in admins to select which core properties of the user entity should be exposed in
the review table. By default, no properties are exposed. the review table. By default, no properties are exposed.
### Integration with other modules ## INTEGRATION WITH OTHER MODULES
Immediate integration with other modules is contained in module-specific files in Immediate integration with other modules is contained in module-specific files in
the `includes` directory. the `includes` directory.
...@@ -43,9 +53,18 @@ Modules supported out of the box: ...@@ -43,9 +53,18 @@ Modules supported out of the box:
- User Reference (References) - User Reference (References)
- User Points - User Points
### Self-Serve User Merge ## SELF-SERVE USER MERGE
Self-Serve User Merge is a submodule that allows users with the "Merge own Self-Serve User Merge is a submodule that allows users with the "Merge own
accounts" permission to merge a different account into the currently active one, accounts" permission to merge a different account into the currently active one,
by visiting `user/%/edit/merge`. The user will have to enter the e-mail address by visiting `user/%/edit/merge`. The user will have to enter the e-mail address
and password of the account that will be merged. and password of the account that will be merged.
\ No newline at end of file
## MAINTAINERS
- Antonio Savorelli (antiorario) - https://www.drupal.org/u/antiorario
- Dan Chadwick (DanChadwick) - https://www.drupal.org/u/danchadwick
- Allan Chappell (generalredneck) - https://www.drupal.org/u/generalredneck
- Greg Knaddison (greggles) - https://www.drupal.org/u/greggles
- Andrea Soper (ZenDoodles) - https://www.drupal.org/u/zendoodles
- Adrian Lorenc (alorenc) - https://www.drupal.org/u/alorenc
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment